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: firefly_0821_release~3680^2~3345^2~22 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f7a0d426f3e7ec321b8037238b6426566df36edb;p=firefly-linux-kernel-4.4.55.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