Merge remote-tracking branch 'clk/clk-next'

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc drivers/clk/clk-bcm2835.c
Simple merge

diff --cc drivers/clk/ux500/u8500_clk.c
Simple merge

diff --cc drivers/clocksource/nomadik-mtu.c
index 23c780ba0d35ceb7faef3be0664cc1ce77089f83,17c690d1f34daca29cc081a5c293c006abb8c480..8914c3c1c88b08d8c183a23b17f1e2bd1ffb1e06
--- 1/drivers/clocksource/nomadik-mtu.c
--- 2/arch/arm/plat-nomadik/timer.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@@ -174,12 -174,18 +174,18 @@@ void nmdk_clksrc_reset(void
               mtu_base + MTU_CR(0));
  }
  
 -void __init nmdk_timer_init(void __iomem *base)
 +void __init nmdk_timer_init(void __iomem *base, int irq)
  {
        unsigned long rate;
-       struct clk *clk0;
+       struct clk *clk0, *pclk0;
  
        mtu_base = base;
+ 
+       pclk0 = clk_get_sys("mtu0", "apb_pclk");
+       BUG_ON(IS_ERR(pclk0));
+       BUG_ON(clk_prepare(pclk0) < 0);
+       BUG_ON(clk_enable(pclk0) < 0);
+ 
        clk0 = clk_get_sys("mtu0", NULL);
        BUG_ON(IS_ERR(clk0));
        BUG_ON(clk_prepare(clk0) < 0);

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge