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
..
omap	arm/dts: OMAP3+: Add mpu, dsp and iva nodes	2011-10-04 22:29:40 +02:00
arm-boards	arm/versatile: Add device tree support	2011-07-28 01:32:04 -06:00
fsl.txt	arm/mx5: add device tree support for imx51 babbage	2011-10-18 12:43:19 +02:00
gic.txt	ARM: gic: add OF based initialization	2011-10-31 14:03:26 +01:00
pmu.txt
primecell.txt
sirf.txt	ARM: CSR: Adding CSR SiRFprimaII board support	2011-07-09 07:19:28 +08:00
xilinx.txt