From: Greg Kroah-Hartman Date: Mon, 12 Mar 2012 16:13:31 +0000 (-0700) Subject: Merge 3.3-rc7 into usb-next X-Git-Tag: MMI-PSA29.97-13-9~17266^2~22 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f7a0d426f3e7ec321b8037238b6426566df36edb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge 3.3-rc7 into usb-next This resolves the conflict with drivers/usb/host/ehci-fsl.h that happened with changes in Linus's and this branch at the same time. Signed-off-by: Greg Kroah-Hartman --- f7a0d426f3e7ec321b8037238b6426566df36edb