From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Apr 2010 09:37:12 +0000 (+0200)
Subject: Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8e868c14bc5ab6cf6a9e2507823e435520efe2a;p=buildroot.git

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

Fix merge conflicts in CHANGES
---

e8e868c14bc5ab6cf6a9e2507823e435520efe2a
diff --cc CHANGES
index 948cad5c8b,eb5271de40..2d8d2e8c1b
--- a/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