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

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
08cab72f · Arnd Bergmann · 86c1e5a7 · f37a53cc · 08cab72f · 08cab72f
Commit 08cab72f authored 13 years ago by Arnd Bergmann
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
--- a/include/linux/cpu_pm.h
+++ b/include/linux/cpu_pm.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/cpu_pm.c
+++ b/kernel/cpu_pm.c
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
--- a/kernel/irq/settings.h
+++ b/kernel/irq/settings.h
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig