Greg Kroah-Hartman f7a0d426f3 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 <gregkh@linuxfoundation.org>
2012-03-12 09:13:31 -07:00
..
2012-01-09 14:39:22 -08:00
2011-07-12 19:45:19 +08:00
2011-07-12 19:45:19 +08:00
2012-01-05 12:57:17 +00:00
2011-11-15 19:08:27 +08:00
2011-10-08 21:03:06 +08:00
2012-01-09 14:39:22 -08:00
2010-12-18 21:02:14 +08:00
2012-01-05 12:57:17 +00:00