Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Thu, 8 Apr 2010 09:37:12 +0000 (11:37 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 8 Apr 2010 09:37:12 +0000 (11:37 +0200)
commite8e868c14bc5ab6cf6a9e2507823e435520efe2a
treed77981838c034d8819e745d2e1782128ee0bf2d6
parent6620ca7dfe3d3340eee4ea662d97ee611d84814f
parent6caec6f3b3aecf41c3a051ffa4b5d9a2e41775ca
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot

Fix merge conflicts in CHANGES
CHANGES