Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into...

author Sascha Hauer <s.hauer@pengutronix.de>

Wed, 24 Nov 2010 07:24:29 +0000 (08:24 +0100)

committer Sascha Hauer <s.hauer@pengutronix.de>

Wed, 24 Nov 2010 07:24:29 +0000 (08:24 +0100)
author Sascha Hauer <s.hauer@pengutronix.de>
Wed, 24 Nov 2010 07:24:29 +0000 (08:24 +0100)
committer Sascha Hauer <s.hauer@pengutronix.de>
Wed, 24 Nov 2010 07:24:29 +0000 (08:24 +0100)
diff --cc arch/arm/mach-mx3/mach-pcm037.c
Simple merge
diff --cc arch/arm/mach-mx3/mx31moboard-marxbot.c
Simple merge
diff --cc arch/arm/mach-mx3/mx31moboard-smartbot.c
Simple merge
author	Sascha Hauer <s.hauer@pengutronix.de>
	Wed, 24 Nov 2010 07:24:29 +0000 (08:24 +0100)
committer	Sascha Hauer <s.hauer@pengutronix.de>
	Wed, 24 Nov 2010 07:24:29 +0000 (08:24 +0100)
		1	2
arch/arm/mach-mx3/mach-pcm037.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/mx31moboard-marxbot.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/mx31moboard-smartbot.c	patch \|	diff1 \|	diff2 \|	blob \| history