Merge tag 'v3.6-rc4' into next

Linux 3.6-rc4

# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"

diff --combined drivers/input/keyboard/tegra-kbc.c
index c7ae23ead5752c8c4fad3e90ce9ff9cacee5faf0,2c1c9ed1bd9f6ad194405c73d1d14a368ee3ade9..5faaf2553e33e37eedd17d9138617b85248253e9
--- 1/drivers/input/keyboard/tegra-kbc.c
--- 2/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@@ -29,8 -29,8 +29,8 @@@
  #include <linux/of.h>
  #include <linux/clk.h>
  #include <linux/slab.h>
 +#include <linux/input/tegra_kbc.h>
  #include <mach/clk.h>
 -#include <mach/kbc.h>
  
  #define KBC_MAX_DEBOUNCE_CNT  0x3ffu
  
@@@ -492,7 -492,7 +492,7 @@@ static int tegra_kbc_start(struct tegra
        unsigned int debounce_cnt;
        u32 val = 0;
  
-       clk_enable(kbc->clk);
+       clk_prepare_enable(kbc->clk);
  
        /* Reset the KBC controller to clear all previous status.*/
        tegra_periph_reset_assert(kbc->clk);
@@@ -556,7 -556,7 +556,7 @@@ static void tegra_kbc_stop(struct tegra
        disable_irq(kbc->irq);
        del_timer_sync(&kbc->timer);
  
-       clk_disable(kbc->clk);
+       clk_disable_unprepare(kbc->clk);
  }
  
  static int tegra_kbc_open(struct input_dev *dev)