Greg Kroah-Hartman 0c864d8b3e Merge 3.7-rc6 into usb-next. ...

This resolves a conflict with these files:
	drivers/usb/early/ehci-dbgp.c
	drivers/usb/host/ehci-ls1x.c
	drivers/usb/host/ohci-xls.c
	drivers/usb/musb/ux500.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-11-16 18:46:21 -08:00

66 KiB

Raw Blame History

View Raw