Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/omap_l3_smx.c
index 4321e79389291c9695e4695d91132f64b48cc803,4321e79389291c9695e4695d91132f64b48cc803,6a7d87b6bcb4e1c9769f99f57d21236787848b2d,5f2da7565b68b917dd439c4574ab98402ed1790c..873c0e33b512e1da521e2277a8122b60aa84a779
--- 1/arch/arm/mach-omap2/omap_l3_smx.c
--- 2/arch/arm/mach-omap2/omap_l3_smx.c
--- 3/arch/arm/mach-omap2/omap_l3_smx.c
--- 4/arch/arm/mach-omap2/omap_l3_smx.c
+++ b/arch/arm/mach-omap2/omap_l3_smx.c
@@@@@ -199,10 -199,10 -193,9 -199,10 +193,9 @@@@@ static irqreturn_t omap3_l3_app_irq(in
        /* identify the error source */
        for (err_source = 0; !(status & (1 << err_source)); err_source++)
                                                                        ;
   -    error = omap3_l3_readll(base, L3_ERROR_LOG);
  + 
  ++    base = l3->rt + *(omap3_l3_bases[int_type] + err_source);
   +    error = omap3_l3_readll(base, L3_ERROR_LOG);
--  
        if (error) {
                error_addr = omap3_l3_readll(base, L3_ERROR_LOG_ADDR);
    

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