Commits

Peter Korsgaard committed e8e868c14bcM
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot Fix merge conflicts in CHANGES
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot Fix merge conflicts in CHANGES