Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next
Tony Lindgren [Tue, 17 May 2011 10:44:50 +0000 (03:44 -0700)]
1  2  3  4 
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/omap_l3_smx.c
arch/arm/mach-omap2/voltage.c

Simple merge
@@@@@ -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);
    
Simple merge