Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

author Arnd Bergmann <arnd@arndb.de>

Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)

committer Arnd Bergmann <arnd@arndb.de>

Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)
author Arnd Bergmann <arnd@arndb.de>
Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)
diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge
diff --cc arch/arm/mach-omap2/board-overo.c
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)
		1	2
arch/arm/mach-omap2/board-cm-t35.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	patch \|	diff1 \|	diff2 \|	blob \| history