Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6