Merge remote-tracking branch 'i.MX/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
diff --cc arch/arm/mach-mx5/board-mx51_efikamx.c
Simple merge
diff --cc arch/arm/mach-mx5/board-mx51_efikasb.c
Simple merge
diff --cc arch/arm/mach-mx5/mx51_efika.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
		1	2
arch/arm/mach-mx5/board-mx51_efikamx.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikasb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/mx51_efika.c	patch \|	diff1 \|	diff2 \|	blob \| history