Android SDK / linux-phytec-ti / 5d3a0a95868

Commits

Olof Johansson committed 5d3a0a95868M01 Oct 2012

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

Showing diff to7e95c548818