Merge branch 'tegra/cleanup' into next/cleanup

author Arnd Bergmann <arnd@arndb.de>

Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)

committer Arnd Bergmann <arnd@arndb.de>

Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)
author Arnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	patch \|	diff1 \|	diff2 \|	blob \| history