diff --git a/[refs] b/[refs]
index ecc4dc017f6c..c6f0249906c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7
+refs/heads/master: a71ba09655d197f22938fffa6f5d210ff5134f98
diff --git a/trunk/Documentation/DocBook/sh.tmpl b/trunk/Documentation/DocBook/sh.tmpl
index 0c3dc4c69dd1..d858d92cf6d9 100644
--- a/trunk/Documentation/DocBook/sh.tmpl
+++ b/trunk/Documentation/DocBook/sh.tmpl
@@ -19,13 +19,17 @@
   </authorgroup>
 
   <copyright>
-   <year>2008</year>
+   <year>2008-2010</year>
    <holder>Paul Mundt</holder>
   </copyright>
   <copyright>
-   <year>2008</year>
+   <year>2008-2010</year>
    <holder>Renesas Technology Corp.</holder>
   </copyright>
+  <copyright>
+   <year>2010</year>
+   <holder>Renesas Electronics Corp.</holder>
+  </copyright>
 
   <legalnotice>
    <para>
@@ -77,7 +81,7 @@
   </chapter>
   <chapter id="clk">
     <title>Clock Framework Extensions</title>
-!Iarch/sh/include/asm/clock.h
+!Iinclude/linux/sh_clk.h
   </chapter>
   <chapter id="mach">
     <title>Machine Specific Interfaces</title>
diff --git a/trunk/include/linux/sh_clk.h b/trunk/include/linux/sh_clk.h
index 6d7de242be1d..1636d1e2a5f1 100644
--- a/trunk/include/linux/sh_clk.h
+++ b/trunk/include/linux/sh_clk.h
@@ -46,7 +46,7 @@ struct clk {
 
 #define CLK_ENABLE_ON_INIT	(1 << 0)
 
-/* arch/sh/kernel/cpu/clock.c */
+/* drivers/sh/clk.c */
 unsigned long followparent_recalc(struct clk *);
 void recalculate_root_clocks(void);
 void propagate_rate(struct clk *);
@@ -55,7 +55,6 @@ int clk_register(struct clk *);
 void clk_unregister(struct clk *);
 void clk_enable_init_clocks(void);
 
-/* the exported API, in addition to clk_set_rate */
 /**
  * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
  * @clk: clock source