Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

author Russell King <[email protected]>

Thu, 28 Oct 2010 10:13:00 +0000 (11:13 +0100)

committer Russell King <[email protected]>

Thu, 28 Oct 2010 10:13:00 +0000 (11:13 +0100)
author Russell King <[email protected]>
Thu, 28 Oct 2010 10:13:00 +0000 (11:13 +0100)
committer Russell King <[email protected]>
Thu, 28 Oct 2010 10:13:00 +0000 (11:13 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-imx/mach-mx27_3ds.c
Simple merge
diff --cc arch/arm/mach-mx25/mach-mx25_3ds.c
Simple merge
diff --cc arch/arm/mach-mx3/mach-mx31_3ds.c
Simple merge
diff --cc arch/arm/mach-mx3/mach-mx35_3ds.c
Simple merge
diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge
author	Russell King <[email protected]>
	Thu, 28 Oct 2010 10:13:00 +0000 (11:13 +0100)
committer	Russell King <[email protected]>
	Thu, 28 Oct 2010 10:13:00 +0000 (11:13 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx25/mach-mx25_3ds.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/mach-mx31_3ds.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/mach-mx35_3ds.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_babbage.c	patch \|	diff1 \|	diff2 \|	blob \| history