Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot

Fix merge conflicts in CHANGES

diff --cc CHANGES
index 948cad5c8bea22416bdcf4d482ec06cb39796901,eb5271de406c967867245c12b833aad9b8b75487..2d8d2e8c1b5c25fe44fecb9150c3417898bcd1eb
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -8,13 -8,14 +8,13 @@@
  
        X.org updated to 7.5.
  
-       New packages: librsync, lmbench, netperf, squid
+       New packages: librsync, libusb-compat, lmbench, netperf, squid
  
        Updated/fixed packages: busybox, dnsmasq, dosfstools,
 -      e2fsprogs, freetype, iperf, iptables, iw, less, libdrm,
 -      libgcrypt, libglib2, libpng, libusb, libxml2, matchbox, mdadm,
 -      memstat, mtd-utils, nano, openssl, php, pppd, qt, radvd,
 -      setserial, squashfs, usb_modeswitch, wget, xlib_libX11,
 -      xlib_libXfont
 +      e2fsprogs, fbv, freetype, iperf, iptables, iw, less, libdrm,
 +      libgcrypt, libglib2, libpng, libxml2, matchbox, mdadm, memstat,
 +      mtd-utils, nano, openssl, php, pppd, qt, radvd, setserial,
-       squashfs, wget, xlib_libX11, xlib_libXfont
++      squashfs, usb_modeswith, wget, xlib_libX11, xlib_libXfont
  
        Issues resolved (http://bugs.uclibc.org):
  
@@@ -23,7 -24,9 +23,10 @@@
        #800: [PATCH] iperf update to 2.0.4
        #805: [PATCH] mdadm - version update
        #817: integrator926_defconfig uses unsupported uboot board name
 +      #851: Add option to specify --sysroot value for external toolchain
+       #1093: Upgrade libusb to v1.0.3 and add new libusb-compat
+                package for compatibility with old packages that expect
+                the pre-1.0 API.
        #1105: Add new netperf package
        #1111: Bump wget to 1.12 and migrate to Makefile.autotools.in
        #1117: Bump nano to 2.2.3 and migrate to Makefile.autotools.in