Arnd Bergmann 08cab72f91 Merge branch 'dt/gic' into next/dt ...

Conflicts:
	arch/arm/include/asm/localtimer.h
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-omap2/board-generic.c

2011-10-31 14:08:10 +01:00

..

asm

Merge branch 'dt/gic' into next/dt

2011-10-31 14:08:10 +01:00