Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-s5pv310/cpu.c
index 72ab289e78166bfb102f6e4e46dc44cfb7f548ac,72092db104c54f93c3f51bd16f02d6f9df073ab1..0db0fb65bd706185d0e5f20b1f22072ef1750f25
--- 1/arch/arm/mach-s5pv310/cpu.c
--- 2/arch/arm/mach-s5pv310/cpu.c
+++ b/arch/arm/mach-s5pv310/cpu.c
@@@ -120,9 -132,20 +130,18 @@@ void __init s5pv310_init_irq(void
  {
        int irq;
  
 -      gic_cpu_base_addr = S5P_VA_GIC_CPU;
 -      gic_dist_init(0, S5P_VA_GIC_DIST, IRQ_LOCALTIMER);
 -      gic_cpu_init(0, S5P_VA_GIC_CPU);
 +      gic_init(0, IRQ_LOCALTIMER, S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
  
        for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
+ 
+               /*
+                * From SPI(0) to SPI(39) and SPI(51), SPI(53) are
+                * connected to the interrupt combiner. These irqs
+                * should be initialized to support cascade interrupt.
+                */
+               if ((irq >= 40) && !(irq == 51) && !(irq == 53))
+                       continue;
+ 
                combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
                                COMBINER_IRQ(irq, 0));
                combiner_cascade_irq(irq, IRQ_SPI(irq));