Merge tag 'for-usb-next-2012-05-03' of git://git.kernel.org/pub/scm/linux/kernel...