Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next

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

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

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

diff --cc arch/arm/plat-omap/sram.c
index e1493d8,876f5a7..4f0145d
--- 1/arch/arm/plat-omap/sram.c
--- 2/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@@ -343,14 -365,17 +352,15 @@@ static inline int omap243x_sram_init(vo
  static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl,
                                              u32 sdrc_actim_ctrla,
                                              u32 sdrc_actim_ctrlb,
-                                             u32 m2);
+                                             u32 m2, u32 unlock_dll);
  u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla,
-                             u32 sdrc_actim_ctrlb, u32 m2)
+                             u32 sdrc_actim_ctrlb, u32 m2, u32 unlock_dll)
  {
 -      if (!_omap3_sram_configure_core_dpll)
 -              omap_sram_error();
 -
 +      BUG_ON(!_omap3_sram_configure_core_dpll);
        return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl,
                                               sdrc_actim_ctrla,
-                                              sdrc_actim_ctrlb, m2);
+                                              sdrc_actim_ctrlb, m2,
+                                              unlock_dll);
  }
  
  /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */