Merge branch 'next/cleanup2' into HEAD

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-bcmring/arch.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/dma.c
This commit is contained in:
Olof Johansson 2012-10-01 14:25:41 -07:00
commit 5d3a0a9586
87 changed files with 159 additions and 17516 deletions