Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards

* 'board-specific' of git://github.com/hzhuang1/linux: (5 commits)
  ARM: pxa: add dummy clock for pxa25x and pxa27x
  ARM: mmp: append irq name of gpio device
  pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
  pxa/hx4700: Add ASIC3 LED support
  pxa/hx4700: Correct StrataFlash block size discovery

(update to v3.3-rc5)

diff --combined arch/arm/mach-omap2/pm24xx.c
index 1f736222a629c50f46cbcace5da6e986db631489,23de98d0384151b76274f67a99a10a005d4b3541..a4eb5c280435701d571b25a2b5f95c2d7f2b6fec
--- 1/arch/arm/mach-omap2/pm24xx.c
--- 2/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -82,13 -82,7 +82,7 @@@ static int omap2_fclks_active(void
        f1 = omap2_cm_read_mod_reg(CORE_MOD, CM_FCLKEN1);
        f2 = omap2_cm_read_mod_reg(CORE_MOD, OMAP24XX_CM_FCLKEN2);
  
-       /* Ignore UART clocks.  These are handled by UART core (serial.c) */
-       f1 &= ~(OMAP24XX_EN_UART1_MASK | OMAP24XX_EN_UART2_MASK);
-       f2 &= ~OMAP24XX_EN_UART3_MASK;
- 
-       if (f1 | f2)
-               return 1;
-       return 0;
+       return (f1 | f2) ? 1 : 0;
  }
  
  static void omap2_enter_full_retention(void)
@@@ -232,6 -226,7 +226,6 @@@ static int omap2_can_sleep(void
  
  static void omap2_pm_idle(void)
  {
 -      local_irq_disable();
        local_fiq_disable();
  
        if (!omap2_can_sleep()) {
@@@ -248,6 -243,7 +242,6 @@@
  
  out:
        local_fiq_enable();
 -      local_irq_enable();
  }
  
  #ifdef CONFIG_SUSPEND
@@@ -466,7 -462,7 +460,7 @@@ static int __init omap2_pm_init(void
        }
  
        suspend_set_ops(&omap_pm_ops);
 -      pm_idle = omap2_pm_idle;
 +      arm_pm_idle = omap2_pm_idle;
  
        return 0;
  }