Merge 3.4-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 May 2012 16:03:39 +0000 (09:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 May 2012 16:03:39 +0000 (09:03 -0700)
commit61906313bd41cde2f9aaa14e461e6108d3e71aaa
treec84805a9c67e3baf9e5acf13a3f55f7058a9131f
parent3aa2ae74ba630ec9b98736d64aea8e4cb490861d
parentd48b97b403d23f6df0b990cee652bdf9a52337a3
Merge 3.4-rc6 into usb-next

This resolves the conflict with:
drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/cdc-wdm.c
drivers/usb/host/ehci-pci.c
drivers/usb/host/ehci-tegra.c
include/linux/usb/hcd.h