Merge branch 'tegra/cleanup' into next/cleanup
Arnd Bergmann [Thu, 20 Oct 2011 12:59:19 +0000 (14:59 +0200)]
1  2 
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c

Simple merge
Simple merge