Olof Johansson 5d3a0a9586 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

2012-10-01 14:25:41 -07:00

..

gen-mach-types

arm: move mach-types to include/generated

2009-12-12 13:08:14 +01:00

mach-types

Merge branch 'next/cleanup2' into HEAD

2012-10-01 14:25:41 -07:00

Makefile

arm: move mach-types to include/generated

2009-12-12 13:08:14 +01:00