Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
commitd50f58bbd979e86378dfdec982452041f0e604ef
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 14:48:37 +0000 (29 15:48 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 14:48:37 +0000 (29 15:48 +0100)
tree511938033b3346983175c70dd4d0afeb00b59b82
parent129961ecaf21c9ee899ad9067d917c1aa172fb7a
parent79d3c2c2395a89a70d25f0c77c11afc87efab89b
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
arch/arm/Makefile
arch/arm/mach-mx3/mach-mx31lilly.c
drivers/media/video/Kconfig
drivers/usb/host/ehci-mxc.c