Merge 3.7-rc3 into usb-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 16:04:39 +0000 (09:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 16:04:39 +0000 (09:04 -0700)
commitb472b8e22f9f9bc88dc73017d61609684289fb13
treecbb2ec0c2fd2cf6d9f4d2e323e97aa757bd93c59
parentd124a60dbbe7c12f3871e2c7fc71f98a821ee9a8
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
Merge 3.7-rc3 into usb-next.

This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
drivers/usb/misc/ezusb.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hub.c
drivers/usb/misc/ezusb.c