Merge branch 'devel' into for-next

Conflicts:
	arch/arm/common/gic.c

diff --cc arch/arm/common/gic.c
index 410a546060a2eecf82859d76c528223e8796f9f4,a1feb6b4f9f545f6d53d6e78bf1d04d62b6d4bdd..b2dc2dd7f1df6d25fbba306e0822563883b18859
--- 1/arch/arm/common/gic.c
--- 2/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@@ -582,16 -696,12 +697,14 @@@ void __init gic_init_bases(unsigned in
         * For primary GICs, skip over SGIs.
         * For secondary GICs, skip over PPIs, too.
         */
 +      domain->hwirq_base = 32;
        if (gic_nr == 0) {
-               gic_cpu_base_addr = cpu_base;
- 
 -              domain->hwirq_base = 16;
 -              if (irq_start > 0)
 -                      irq_start = (irq_start & ~31) + 16;
 -      } else
 -              domain->hwirq_base = 32;
 +              if ((irq_start & 31) > 0) {
 +                      domain->hwirq_base = 16;
 +                      if (irq_start != -1)
 +                              irq_start = (irq_start & ~31) + 16;
 +              }
 +      }
  
        /*
         * Find out how many interrupts are supported.

diff --cc arch/arm/include/asm/pgtable.h
index a1aca792e050b041a78cf55a4623c5a173fc3ce2,bcae9b81a6d08d72876f06ab355d3e9a5ff30816..a24a2b8feb9213e1632ccfa33011ad2b1c9d864c
--- 1/arch/arm/include/asm/pgtable.h
--- 2/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@@ -20,9 -20,7 +20,8 @@@
  
  #else
  
 +#include <asm-generic/pgtable-nopud.h>
  #include <asm/memory.h>
- #include <mach/vmalloc.h>
  #include <asm/pgtable-hwdef.h>
  
  #include <asm/pgtable-2level.h>

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-bcmring/dma.c
Simple merge

diff --cc arch/arm/mach-cns3xxx/cns3420vb.c
index 9b8c3d59731bf625670b2e4737d2e3d01c177847,594852fe24cc1dfe517e904e383cc677c73a819e..2c5fb4c7e509b8786fb1ba0d45cb974bc373f4d2
--- 1/arch/arm/mach-cns3xxx/cns3420vb.c
--- 2/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@@ -201,6 -202,6 +202,7 @@@ MACHINE_START(CNS3420VB, "Cavium Networ
        .map_io         = cns3420_map_io,
        .init_irq       = cns3xxx_init_irq,
        .timer          = &cns3xxx_timer,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = cns3420_init,
 +      .restart        = cns3xxx_restart,
  MACHINE_END

diff --cc arch/arm/mach-ep93xx/adssphere.c
index 7b41651728cdf406efd2becb71124653a614c86d,d9b0ea2ba4d80c6769fe6b822c759307a2bd1585..681e939407d4bc907dfb99f528992c12bb462eec
--- 1/arch/arm/mach-ep93xx/adssphere.c
--- 2/arch/arm/mach-ep93xx/adssphere.c
+++ b/arch/arm/mach-ep93xx/adssphere.c
@@@ -36,7 -37,7 +37,8 @@@ MACHINE_START(ADSSPHERE, "ADS Sphere bo
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = adssphere_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END

diff --cc arch/arm/mach-ep93xx/edb93xx.c
index c5731c68acc02b69199a56a89b4724177465f68f,9bbae0835f27925037498db672836100d2490c60..d115653edca3e3cd9632fcfb14ebb616dad7a985
--- 1/arch/arm/mach-ep93xx/edb93xx.c
--- 2/arch/arm/mach-ep93xx/edb93xx.c
+++ b/arch/arm/mach-ep93xx/edb93xx.c
@@@ -250,9 -251,9 +251,10 @@@ MACHINE_START(EDB9301, "Cirrus Logic ED
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -262,9 -263,9 +264,10 @@@ MACHINE_START(EDB9302, "Cirrus Logic ED
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -274,9 -275,9 +277,10 @@@ MACHINE_START(EDB9302A, "Cirrus Logic E
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -286,9 -287,9 +290,10 @@@ MACHINE_START(EDB9307, "Cirrus Logic ED
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -298,9 -299,9 +303,10 @@@ MACHINE_START(EDB9307A, "Cirrus Logic E
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -310,9 -311,9 +316,10 @@@ MACHINE_START(EDB9312, "Cirrus Logic ED
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -322,9 -323,9 +329,10 @@@ MACHINE_START(EDB9315, "Cirrus Logic ED
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -334,8 -335,8 +342,9 @@@ MACHINE_START(EDB9315A, "Cirrus Logic E
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = edb93xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif

diff --cc arch/arm/mach-ep93xx/gesbc9312.c
index 7b89e8a1bb7b9ad7c1bb8d01f77eb9cda14171e1,1dd32a7c5f151767037a6f365232589ec1d909ca..af46970dc58e78c2a484c4db0351c1eb8f94ab4b
--- 1/arch/arm/mach-ep93xx/gesbc9312.c
--- 2/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
@@@ -36,7 -37,7 +37,8 @@@ MACHINE_START(GESBC9312, "Glomation GES
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = gesbc9312_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END

diff --cc arch/arm/mach-ep93xx/micro9.c
index 050ce9216d7cb1c7373ec452d10eb11c6628c2b4,a6dae6c2e3c1f96b749eb8526fccfbd7cf4b04d7..7b98084f0c97bf14e8830a30b3dd18b10d5a3163
--- 1/arch/arm/mach-ep93xx/micro9.c
--- 2/arch/arm/mach-ep93xx/micro9.c
+++ b/arch/arm/mach-ep93xx/micro9.c
@@@ -80,9 -81,9 +81,10 @@@ MACHINE_START(MICRO9, "Contec Micro9-Hi
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = micro9_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -92,9 -93,9 +94,10 @@@ MACHINE_START(MICRO9M, "Contec Micro9-M
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = micro9_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -104,9 -105,9 +107,10 @@@ MACHINE_START(MICRO9L, "Contec Micro9-L
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = micro9_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif
  
@@@ -116,8 -117,8 +120,9 @@@ MACHINE_START(MICRO9S, "Contec Micro9-S
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = micro9_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END
  #endif

diff --cc arch/arm/mach-ep93xx/simone.c
index 188cbdb4dbdadf6101e26f2262507650eeb280b2,40121ba8e711f76359d8017ded27d127aa1843b1..f4e553eca21c7d7c4cfdfd406489a34623945592
--- 1/arch/arm/mach-ep93xx/simone.c
--- 2/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@@ -80,7 -81,7 +81,8 @@@ MACHINE_START(SIM_ONE, "Simplemachines 
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = simone_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END

diff --cc arch/arm/mach-ep93xx/snappercl15.c
index 797afdee80abd7fa2f06aefddade9e938a14dafa,ec7c63ff01e22e4e62f7e678069778bcd828fac9..fd846331ddff9119023c2a726adae50a16578f6f
--- 1/arch/arm/mach-ep93xx/snappercl15.c
--- 2/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@@ -177,7 -178,7 +178,8 @@@ MACHINE_START(SNAPPER_CL15, "Bluewater 
        .atag_offset    = 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = snappercl15_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END

diff --cc arch/arm/mach-ep93xx/ts72xx.c
index de9bb541b5500a35992d818692d01cfd47a192ed,760384e6407de90adc04fd78781df2ef2ba7da67..79f8ecf07a190a082ac4da524ef185faea62715a
--- 1/arch/arm/mach-ep93xx/ts72xx.c
--- 2/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@@ -247,7 -248,7 +248,8 @@@ MACHINE_START(TS72XX, "Technologic Syst
        .atag_offset    = 0x100,
        .map_io         = ts72xx_map_io,
        .init_irq       = ep93xx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &ep93xx_timer,
        .init_machine   = ts72xx_init_machine,
 +      .restart        = ep93xx_restart,
  MACHINE_END

diff --cc arch/arm/mach-highbank/highbank.c
index 9d356a10a198110f457dce5cb1eb83b69e751e6a,89bdf0039f7bf25458236de67b14b3c8e3c30e64..01da40d9c8dd80d3b3f131be15e6c5c9046a6842
--- 1/arch/arm/mach-highbank/highbank.c
--- 2/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -140,7 -140,7 +140,8 @@@ DT_MACHINE_START(HIGHBANK, "Highbank"
        .map_io         = highbank_map_io,
        .init_irq       = highbank_init_irq,
        .timer          = &highbank_timer,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = highbank_init,
        .dt_compat      = highbank_match,
 +      .restart        = highbank_restart,
  MACHINE_END

diff --cc arch/arm/mach-netx/nxdb500.c
index 5384b5a78f688bcb9a976957c9bae392ffac6b02,ef8cf3574a0259756ac89284bb74eff300757c36..180ea899a48afcf76586f24cf1a68cca5438f098
--- 1/arch/arm/mach-netx/nxdb500.c
--- 2/arch/arm/mach-netx/nxdb500.c
+++ b/arch/arm/mach-netx/nxdb500.c
@@@ -203,7 -204,7 +204,8 @@@ MACHINE_START(NXDB500, "Hilscher nxdb50
        .atag_offset    = 0x100,
        .map_io         = netx_map_io,
        .init_irq       = netx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &netx_timer,
        .init_machine   = nxdb500_init,
 +      .restart        = netx_restart,
  MACHINE_END

diff --cc arch/arm/mach-netx/nxdkn.c
index 2df3783ef45933fd56c39dbe269caf985dbe6497,588558bdd800c160429300220e69ddcc16d69cc3..58009e29b20e722d5f9759d148d3a26e1b3fbcc4
--- 1/arch/arm/mach-netx/nxdkn.c
--- 2/arch/arm/mach-netx/nxdkn.c
+++ b/arch/arm/mach-netx/nxdkn.c
@@@ -96,7 -97,7 +97,8 @@@ MACHINE_START(NXDKN, "Hilscher nxdkn"
        .atag_offset    = 0x100,
        .map_io         = netx_map_io,
        .init_irq       = netx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &netx_timer,
        .init_machine   = nxdkn_init,
 +      .restart        = netx_restart,
  MACHINE_END

diff --cc arch/arm/mach-netx/nxeb500hmi.c
index 26255b2ce47386a544a7c983e22b3ba2176c6f13,cfcbb50386487f450ed3de4546327df2980a4349..122e99826ef6fd0869a80f2935352c081a000ec1
--- 1/arch/arm/mach-netx/nxeb500hmi.c
--- 2/arch/arm/mach-netx/nxeb500hmi.c
+++ b/arch/arm/mach-netx/nxeb500hmi.c
@@@ -180,7 -181,7 +181,8 @@@ MACHINE_START(NXEB500HMI, "Hilscher nxe
        .atag_offset    = 0x100,
        .map_io         = netx_map_io,
        .init_irq       = netx_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &netx_timer,
        .init_machine   = nxeb500hmi_init,
 +      .restart        = netx_restart,
  MACHINE_END

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index 68c7b79bad790f2f5a134c1a958255cb3baf5a00,f98259c050eea48acd4b480ba1058ed339ed656c..7c878bf0034094fbbc8e31a933f9d091b4ae95f0
--- 1/arch/arm/mach-nomadik/board-nhk8815.c
--- 2/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -282,7 -281,7 +283,8 @@@ MACHINE_START(NOMADIK, "NHK8815"
        .atag_offset    = 0x100,
        .map_io         = cpu8815_map_io,
        .init_irq       = cpu8815_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &nomadik_timer,
        .init_machine   = nhk8815_platform_init,
 +      .restart        = cpu8815_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-2430sdp.c
index 2e730242132f31d8404f18463e4290a705c1d061,d88143faca59c33d0d277c33a01954c40d75b473..7370983f809fc3994a8722970f2c6f7f1a85f08e
--- 1/arch/arm/mach-omap2/board-2430sdp.c
--- 2/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -301,7 -301,7 +301,8 @@@ MACHINE_START(OMAP_2430SDP, "OMAP2430 s
        .map_io         = omap243x_map_io,
        .init_early     = omap2430_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = omap_2430sdp_init,
        .timer          = &omap2_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 7111677c7e6b7bf64cc1d1aedb09fa0ebbef7fb7,83126368ed99f2bf0d32679c0ec1e2cb265a5516..9996334cb6879f2fe6b7b770608a7db7cde8375f
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -728,7 -728,7 +728,8 @@@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3
        .map_io         = omap3_map_io,
        .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_3430sdp_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-3630sdp.c
index a01d08118a405d5121ec3c4caedd1dfcadadc26c,7969dd904bd3a5ae9f3bca43cf8911018c1c965a..6ef350d1ae4f40a89a8b1bc54c6858780db1b2a8
--- 1/arch/arm/mach-omap2/board-3630sdp.c
--- 2/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@@ -215,7 -215,7 +215,8 @@@ MACHINE_START(OMAP_3630SDP, "OMAP 3630S
        .map_io         = omap3_map_io,
        .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_sdp_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-4430sdp.c
index 8a46ad8f1227de145c960f633f203c0923de65c3,ef2bbc09428a2e29b2786bbeb623ac307e1d1ed8..bad5d5a5ef7949fafdeb06ce4a2e95d686eeb29c
--- 1/arch/arm/mach-omap2/board-4430sdp.c
--- 2/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -983,7 -984,7 +984,8 @@@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4
        .map_io         = omap4_map_io,
        .init_early     = omap4430_init_early,
        .init_irq       = gic_init_irq,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = omap_4430sdp_init,
        .timer          = &omap4_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-am3517crane.c
index c1d6b6338b005ef0f09027997d8752f9f53e0e33,7e90f93263dba49e0470915b16cacaf0fe6b0e08..c3851e8de28bf78d94f4be19baa0ca869915cd95
--- 1/arch/arm/mach-omap2/board-am3517crane.c
--- 2/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@@ -98,7 -98,7 +98,8 @@@ MACHINE_START(CRANEBOARD, "AM3517/05 CR
        .map_io         = omap3_map_io,
        .init_early     = am35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = am3517_crane_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-am3517evm.c
index 18c079070ec3ecda655f6b096d4d8db5ceaf92ea,551cae8d9b8a08b036a135bc7be1f72176adbd75..f5a3a3f117394e0c713b9deff1419f9f02fba415
--- 1/arch/arm/mach-omap2/board-am3517evm.c
--- 2/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -491,7 -491,7 +491,8 @@@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM
        .map_io         = omap3_map_io,
        .init_early     = am35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = am3517_evm_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-apollon.c
index 75c731c45b2df364c7fb88e4cd5e319ed226de96,5a66480feed099f0463209c05f194b280a69f5ac..ac773829941f487493f4ce0592dfa787592211a9
--- 1/arch/arm/mach-omap2/board-apollon.c
--- 2/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -354,7 -354,7 +354,8 @@@ MACHINE_START(OMAP_APOLLON, "OMAP24xx A
        .map_io         = omap242x_map_io,
        .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = omap_apollon_init,
        .timer          = &omap2_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-cm-t35.c
index c3402cdf0bac212b63dff4c87897b5f0c165ada3,510b6a2ff0fa3c3675d81f54374e58bc89d41e62..1545102d1f9b2b5a8471785aadfe463f84185d30
--- 1/arch/arm/mach-omap2/board-cm-t35.c
--- 2/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@@ -634,9 -634,9 +634,10 @@@ MACHINE_START(CM_T35, "Compulab CM-T35"
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = cm_t35_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  
  MACHINE_START(CM_T3730, "Compulab CM-T3730")
@@@ -645,7 -645,7 +646,8 @@@
        .map_io         = omap3_map_io,
        .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = cm_t3730_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-cm-t3517.c
index 0b06ac3d440b4c8c55c7046c266b7fcaf8f91c11,efc5cedb1fbb86f51c20aeacaf5775eea772bd27..f36d694d21590e069aa390a66eb56024d113d8f7
--- 1/arch/arm/mach-omap2/board-cm-t3517.c
--- 2/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@@ -299,7 -299,7 +299,8 @@@ MACHINE_START(CM_T3517, "Compulab CM-T3
        .map_io         = omap3_map_io,
        .init_early     = am35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = cm_t3517_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-devkit8000.c
index 519e5f9d491cb30d43c467c1d6ed7f590c8f97f0,d81ea7fa75ef6f59425d1f44c05af46a6ea339d0..e873063f4fdaf4cac7fffe5d18ca718a79cb84fe
--- 1/arch/arm/mach-omap2/board-devkit8000.c
--- 2/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@@ -660,7 -660,7 +660,8 @@@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = devkit8000_init,
        .timer          = &omap3_secure_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
index 34ccde484fa61eed35644ecc193d984df59b692c,ec4018362e8ea3f9e8a1d937e9ca0b2f92ccaf59..54af800d143c0e261b4acd6548103c6b3c08634f
--- 1/arch/arm/mach-omap2/board-h4.c
--- 2/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -396,7 -396,7 +396,8 @@@ MACHINE_START(OMAP_H4, "OMAP2420 H4 boa
        .map_io         = omap242x_map_io,
        .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = omap_h4_init,
        .timer          = &omap2_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-igep0020.c
index e1850d555616bd2ebaa7e0e3ae834d7b9b5566ad,5949f6ae3edf6038cdf1c4d46798924e09da2b92..a59ace0ed560a57cdf1009cd15d596b94d71c76d
--- 1/arch/arm/mach-omap2/board-igep0020.c
--- 2/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@@ -672,9 -672,9 +672,10 @@@ MACHINE_START(IGEP0020, "IGEP v2 board"
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = igep_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  
  MACHINE_START(IGEP0030, "IGEP OMAP3 module")
@@@ -683,7 -683,7 +684,8 @@@
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = igep_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-ldp.c
index 84bbdd6e5aff7c0b8628446f6feac9736b0567c1,13bde0e6693463a61610eba0749ad2315571e119..2d2a61f7dcbf8e3d799fee8054a39011d94ab603
--- 1/arch/arm/mach-omap2/board-ldp.c
--- 2/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -434,7 -434,7 +434,8 @@@ MACHINE_START(OMAP_LDP, "OMAP LDP board
        .map_io         = omap3_map_io,
        .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_ldp_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-n8x0.c
index cc1dd541224a8fb096862f5a62a8a77ab6c5244c,bebd3d84365eec43e34eb5f786b1956c27e0a15b..cef2cf1c0b8d9affe9afdedcaa16376b1caab783
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -689,9 -689,9 +689,10 @@@ MACHINE_START(NOKIA_N800, "Nokia N800"
        .map_io         = omap242x_map_io,
        .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = n8x0_init_machine,
        .timer          = &omap2_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  
  MACHINE_START(NOKIA_N810, "Nokia N810")
@@@ -700,9 -700,9 +701,10 @@@
        .map_io         = omap242x_map_io,
        .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = n8x0_init_machine,
        .timer          = &omap2_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  
  MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
@@@ -711,7 -711,7 +713,8 @@@
        .map_io         = omap242x_map_io,
        .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = n8x0_init_machine,
        .timer          = &omap2_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index bb6031f6dcb6f4ebf12d8f4bd71f684adc25c226,c34f56588284bfe00deff8c0ca6d19d36245395d..7ffcd2839e7ba872d872e0a53476b2e95832c2a2
--- 1/arch/arm/mach-omap2/board-omap3beagle.c
--- 2/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -559,7 -559,7 +559,8 @@@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beag
        .map_io         = omap3_map_io,
        .init_early     = omap3_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3_beagle_init,
        .timer          = &omap3_secure_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap3evm.c
index 60912e4732531961913e2430c85581dd19d31d1c,f11bc444e7befeddacc57b6f24ceef9fff5f446f..003fe34c934311251452ba4af1efc20382dbbdb6
--- 1/arch/arm/mach-omap2/board-omap3evm.c
--- 2/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -681,7 -681,7 +681,8 @@@ MACHINE_START(OMAP3EVM, "OMAP3 EVM"
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3_evm_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap3logic.c
index 7ecf04a3ff1db63c5bbce743ad1e29c5512dfcf4,5fa6bad9574ee812aeed2579e42c40942600b1eb..4198dd017d8fdfde7fd00b2a8a00d5f9d7e766fb
--- 1/arch/arm/mach-omap2/board-omap3logic.c
--- 2/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@@ -208,9 -208,9 +208,10 @@@ MACHINE_START(OMAP3_TORPEDO, "Logic OMA
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3logic_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  
  MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
@@@ -218,7 -218,7 +219,8 @@@
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3logic_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index 7071a2473a6b0cbdd5eb83c04a4b63efa1eeee53,ef315c585b752e7c0c845fac37bd6dbbb8bc52de..1644b73017fcafbdc0e7b87a503ac35f92e8f992
--- 1/arch/arm/mach-omap2/board-omap3pandora.c
--- 2/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -606,7 -606,7 +606,8 @@@ MACHINE_START(OMAP3_PANDORA, "Pandora H
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3pandora_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap3stalker.c
index 6e47987d989b98c4b0de9cf8ec2e8a728d549615,b21d70a2e4a7229efae9a754bb1ab37f63438efe..cb089a46f62f691cceec4c20f9f035111dded5a3
--- 1/arch/arm/mach-omap2/board-omap3stalker.c
--- 2/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@@ -454,7 -454,7 +454,8 @@@ MACHINE_START(SBC3530, "OMAP3 STALKER"
        .map_io                 = omap3_map_io,
        .init_early             = omap35xx_init_early,
        .init_irq               = omap3_init_irq,
+       .handle_irq             = omap3_intc_handle_irq,
        .init_machine           = omap3_stalker_init,
        .timer                  = &omap3_secure_timer,
 +      .restart                = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap3touchbook.c
index 5bb590a40f2bbed16c6c67ab641b5dc07ba73486,18cd340f9b7bfb232937404167ed53993676de89..a0b851aafccad1bc87d900d9474cfa689e8cf39d
--- 1/arch/arm/mach-omap2/board-omap3touchbook.c
--- 2/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@@ -381,7 -381,7 +381,8 @@@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbo
        .map_io         = omap3_map_io,
        .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3_touchbook_init,
        .timer          = &omap3_secure_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-omap4panda.c
index 955cbee91b4624044245beaa6f39920b7c7e24e3,b6f114436dbc74bb93d09300deef50db59b57c52..8b06c6a60d02767819f4cdb833f72f3f6471c580
--- 1/arch/arm/mach-omap2/board-omap4panda.c
--- 2/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -576,7 -577,7 +577,8 @@@ MACHINE_START(OMAP4_PANDA, "OMAP4 Pand
        .map_io         = omap4_map_io,
        .init_early     = omap4430_init_early,
        .init_irq       = gic_init_irq,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = omap4_panda_init,
        .timer          = &omap4_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-overo.c
index c14d78129999a764fcae3c64c42860e208540e0e,60a61ea759bf4262b3fd7e529650bf91a0118157..52c0cef77165cb2cbc8a658d8fd63b260ec5662a
--- 1/arch/arm/mach-omap2/board-overo.c
--- 2/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@@ -562,7 -562,7 +562,8 @@@ MACHINE_START(OVERO, "Gumstix Overo"
        .map_io         = omap3_map_io,
        .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = overo_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-rm680.c
index 0c67ecc244d688dc255c86fd2bc3f3db0dcecf0b,a79d49e3fe09a2442ee59debb5ace8480a677a6c..8678b386c6a2ab8e7a0b664546f837eb9966d36f
--- 1/arch/arm/mach-omap2/board-rm680.c
--- 2/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@@ -149,7 -149,7 +149,8 @@@ MACHINE_START(NOKIA_RM680, "Nokia RM-68
        .map_io         = omap3_map_io,
        .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = rm680_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-rx51.c
index c3e716ad2b513bd34ad1b3d3d535c4477f9aafa6,4e3c0965edf3d0a39df68505d3bc3cd30af721ea..27f01f051dfff07135762b216621eabbc6bf1046
--- 1/arch/arm/mach-omap2/board-rx51.c
--- 2/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -127,7 -127,7 +127,8 @@@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 
        .map_io         = omap3_map_io,
        .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = rx51_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-zoom.c
index 68d6f1c875b816f41739d94c538150f52e03692d,70e5b54a2115ec3adfbaa6746e619f28ccb8655a..5c20bcc57f2b951d50fe2bef11080b36e9729a36
--- 1/arch/arm/mach-omap2/board-zoom.c
--- 2/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@@ -135,9 -135,9 +135,10 @@@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 b
        .map_io         = omap3_map_io,
        .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_zoom_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  
  MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
@@@ -146,7 -146,7 +147,8 @@@
        .map_io         = omap3_map_io,
        .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_zoom_init,
        .timer          = &omap3_timer,
 +      .restart        = omap_prcm_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/common.h
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb1176.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb11mp.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pba8.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pbx.c
Simple merge

diff --cc arch/arm/mach-spear3xx/spear300_evb.c
index 8b429f05b6133612e7ce43467392810674587a6a,61068ba67923536ce8604b96cc4a4b1d595bdd16..3462ab9d612231b5107cad2787ffd67c7fdc2632
--- 1/arch/arm/mach-spear3xx/spear300_evb.c
--- 2/arch/arm/mach-spear3xx/spear300_evb.c
+++ b/arch/arm/mach-spear3xx/spear300_evb.c
@@@ -67,7 -68,7 +68,8 @@@ MACHINE_START(SPEAR300, "ST-SPEAR300-EV
        .atag_offset    =       0x100,
        .map_io         =       spear3xx_map_io,
        .init_irq       =       spear3xx_init_irq,
+       .handle_irq     =       vic_handle_irq,
        .timer          =       &spear3xx_timer,
        .init_machine   =       spear300_evb_init,
 +      .restart        =       spear_restart,
  MACHINE_END

diff --cc arch/arm/mach-spear3xx/spear310_evb.c
index a11d6ead0aed75d7fa06b45d9f581632ffa9e680,7903abe92bf6f9c6c2029c6693c5789f5b0698cd..f92c4993f65ae5477d69e11cb2a301cf9c7ab240
--- 1/arch/arm/mach-spear3xx/spear310_evb.c
--- 2/arch/arm/mach-spear3xx/spear310_evb.c
+++ b/arch/arm/mach-spear3xx/spear310_evb.c
@@@ -73,7 -74,7 +74,8 @@@ MACHINE_START(SPEAR310, "ST-SPEAR310-EV
        .atag_offset    =       0x100,
        .map_io         =       spear3xx_map_io,
        .init_irq       =       spear3xx_init_irq,
+       .handle_irq     =       vic_handle_irq,
        .timer          =       &spear3xx_timer,
        .init_machine   =       spear310_evb_init,
 +      .restart        =       spear_restart,
  MACHINE_END

diff --cc arch/arm/mach-spear3xx/spear320_evb.c
index 4239a70686c5a049841e04165fde71b3520477f8,e9751f970933078d462f3382330b5516c642c6b5..105334ab70213e85a4f3c8f8909e5cb634879921
--- 1/arch/arm/mach-spear3xx/spear320_evb.c
--- 2/arch/arm/mach-spear3xx/spear320_evb.c
+++ b/arch/arm/mach-spear3xx/spear320_evb.c
@@@ -71,7 -72,7 +72,8 @@@ MACHINE_START(SPEAR320, "ST-SPEAR320-EV
        .atag_offset    =       0x100,
        .map_io         =       spear3xx_map_io,
        .init_irq       =       spear3xx_init_irq,
+       .handle_irq     =       vic_handle_irq,
        .timer          =       &spear3xx_timer,
        .init_machine   =       spear320_evb_init,
 +      .restart        =       spear_restart,
  MACHINE_END

diff --cc arch/arm/mach-spear6xx/spear600_evb.c
index 0a16559ba26421510f871509c58dd2f30f1707d7,ff139ed0a61ede2037bd6fcd5f78821aa5c93311..c6e4254741cc71348696369e494ab79c86494060
--- 1/arch/arm/mach-spear6xx/spear600_evb.c
--- 2/arch/arm/mach-spear6xx/spear600_evb.c
+++ b/arch/arm/mach-spear6xx/spear600_evb.c
@@@ -46,7 -47,7 +47,8 @@@ MACHINE_START(SPEAR600, "ST-SPEAR600-EV
        .atag_offset    =       0x100,
        .map_io         =       spear6xx_map_io,
        .init_irq       =       spear6xx_init_irq,
+       .handle_irq     =       vic_handle_irq,
        .timer          =       &spear6xx_timer,
        .init_machine   =       spear600_evb_init,
 +      .restart        =       spear_restart,
  MACHINE_END

diff --cc arch/arm/mach-tegra/board-dt.c
index aaaa17c9d21a7bd6e87ee40a4164b67d0d78a38b,f6f03ce340fcafd4a0f72dff707ad3764a6321e2..e417a8383dbbcb4feae0dfdd2f59d956d8faeaa3
--- 1/arch/arm/mach-tegra/board-dt.c
--- 2/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@@ -130,8 -131,8 +131,9 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_dt_init,
 +      .restart        = tegra_assert_system_reset,
        .dt_compat      = tegra_dt_board_compat,
  MACHINE_END

diff --cc arch/arm/mach-tegra/board-harmony.c
index 7eaa52de756cbfe128b44ebfcd8fa0c8d15d40a7,fd190a8dc6654c7e8fb200d85d596ffd15c26f2b..70ee674131f9fee9d77a189c12fafbb0dbd3af65
--- 1/arch/arm/mach-tegra/board-harmony.c
--- 2/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@@ -187,7 -188,7 +188,8 @@@ MACHINE_START(HARMONY, "harmony"
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_harmony_init,
 +      .restart        = tegra_assert_system_reset,
  MACHINE_END

diff --cc arch/arm/mach-tegra/board-paz00.c
index 28c97e3174073f6db4644342b11c5304c7dbbc51,0b7e1cfee70dacb03f9810a5f3ca90a316238737..33d6205ad307c07cafb34296444458c742e66419
--- 1/arch/arm/mach-tegra/board-paz00.c
--- 2/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -190,7 -191,7 +191,8 @@@ MACHINE_START(PAZ00, "Toshiba AC100 / D
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_paz00_init,
 +      .restart        = tegra_assert_system_reset,
  MACHINE_END

diff --cc arch/arm/mach-tegra/board-seaboard.c
index 9b2eca1f5283c0c5c285a1942952ee971a6b8cd5,7328379b1356b0fd8ac54d5f268bae71d7fdf11e..c1599eb8e0cb0acb791551f9b90a0d1f124da1e1
--- 1/arch/arm/mach-tegra/board-seaboard.c
--- 2/arch/arm/mach-tegra/board-seaboard.c
+++ b/arch/arm/mach-tegra/board-seaboard.c
@@@ -284,9 -285,9 +285,10 @@@ MACHINE_START(SEABOARD, "seaboard"
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_seaboard_init,
 +      .restart        = tegra_assert_system_reset,
  MACHINE_END
  
  MACHINE_START(KAEN, "kaen")
@@@ -294,9 -295,9 +296,10 @@@
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_kaen_init,
 +      .restart        = tegra_assert_system_reset,
  MACHINE_END
  
  MACHINE_START(WARIO, "wario")
@@@ -304,7 -305,7 +307,8 @@@
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_wario_init,
 +      .restart        = tegra_assert_system_reset,
  MACHINE_END

diff --cc arch/arm/mach-tegra/board-trimslice.c
index 1fa9e48e8ec627ecad7889676e2901b9686a91ad,60a36a2e0be19696c9a53e96b1afaf716c93fee5..c242314a1db5e55e2a6552da18ef99497f100a7f
--- 1/arch/arm/mach-tegra/board-trimslice.c
--- 2/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@@ -176,7 -177,7 +177,8 @@@ MACHINE_START(TRIMSLICE, "trimslice"
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_trimslice_init,
 +      .restart        = tegra_assert_system_reset,
  MACHINE_END

diff --cc arch/arm/mach-u300/u300.c
index a75c9b83974880926ae84b1fc9920c89b5ec70d9,4a4fd334eb6e5fb081ae81f99422ec9c1f440a0b..def45bda29327eb14eb97cd3712957814b0f9870
--- 1/arch/arm/mach-u300/u300.c
--- 2/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@@ -49,7 -50,7 +50,8 @@@ MACHINE_START(U300, MACH_U300_STRING
        .atag_offset    = BOOT_PARAMS_OFFSET,
        .map_io         = u300_map_io,
        .init_irq       = u300_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &u300_timer,
        .init_machine   = u300_init_machine,
 +      .restart        = u300_restart,
  MACHINE_END

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/mach-versatile/versatile_ab.c
index f1277ac92fac515f81377df735b81862cbc48b4a,c83a1f379f7aba55d15adcf19e3caf2610760425..63b8dd2b9f4d297132605432af9c17363870d517
--- 1/arch/arm/mach-versatile/versatile_ab.c
--- 2/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@@ -39,7 -40,7 +40,8 @@@ MACHINE_START(VERSATILE_AB, "ARM-Versat
        .map_io         = versatile_map_io,
        .init_early     = versatile_init_early,
        .init_irq       = versatile_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &versatile_timer,
        .init_machine   = versatile_init,
 +      .restart        = versatile_restart,
  MACHINE_END

diff --cc arch/arm/mach-versatile/versatile_dt.c
Simple merge

diff --cc arch/arm/mach-versatile/versatile_pb.c
index 839bea633821c399260a0775777b5db345902efd,4d31eeb6c10136023c272bd10d9a562517e190ba..7aab79b665e71ee8bc57899817e29c76db046ac7
--- 1/arch/arm/mach-versatile/versatile_pb.c
--- 2/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@@ -107,7 -108,7 +108,8 @@@ MACHINE_START(VERSATILE_PB, "ARM-Versat
        .map_io         = versatile_map_io,
        .init_early     = versatile_init_early,
        .init_irq       = versatile_init_irq,
+       .handle_irq     = vic_handle_irq,
        .timer          = &versatile_timer,
        .init_machine   = versatile_pb_init,
 +      .restart        = versatile_restart,
  MACHINE_END

diff --cc arch/arm/mach-vexpress/v2m.c
index b9a465bd2d0ffb32af5c5f5e852489df20e4489c,7aa07a8ce2323ff65606070a09cce2a338edd747..6dd10e320ef68de0e16726cca8062bbc911cb6da
--- 1/arch/arm/mach-vexpress/v2m.c
--- 2/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -447,6 -449,6 +448,7 @@@ MACHINE_START(VEXPRESS, "ARM-Versatile 
        .init_early     = v2m_init_early,
        .init_irq       = v2m_init_irq,
        .timer          = &v2m_timer,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = v2m_init,
 +      .restart        = v2m_restart,
  MACHINE_END

diff --cc arch/arm/plat-iop/Makefile
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/common.h
Simple merge

diff --cc include/linux/vmalloc.h
Simple merge

diff --cc mm/vmalloc.c
Simple merge