Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --cc arch/arm/mach-shmobile/clock-sh7372.c
index 59a8f4cde10844a0dcbc07d9fa5079ea020a3138,6b1619a65dbac16bf4535f106ab3b2c03016ed9f..dc8c899aa5eb4aa0b70982bc64bae54498d30522
--- 1/arch/arm/mach-shmobile/clock-sh7372.c
--- 2/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@@ -558,13 -559,8 +558,9 @@@ static struct clk mstp_clks[MSTP_NR] = 
        [MSTP410] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 10, 0), /* IIC4 */
        [MSTP406] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 6, 0), /* USB1 */
        [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */
 +      [MSTP400] = MSTP(&r_clk, SMSTPCR4, 0, 0), /* CMT2 */
  };
  
- #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
- #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk }
- #define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk }
- 
  static struct clk_lookup lookups[] = {
        /* main clocks */
        CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk),