diff --git a/[refs] b/[refs]
index 3eea5d683aa0..2c492d749a30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20036fdcaf05fac0a84ed81a56906493a7d822e2
+refs/heads/master: f7ad160b49c49dc9cd383b9184c6fa4a9b4f7ebb
diff --git a/trunk/include/linux/clk.h b/trunk/include/linux/clk.h
index 5ca8c6fddb56..778777316ea4 100644
--- a/trunk/include/linux/clk.h
+++ b/trunk/include/linux/clk.h
@@ -35,6 +35,8 @@ struct clk;
  * clk_get may return different clock producers depending on @dev.)
  *
  * Drivers must assume that the clock source is not enabled.
+ *
+ * clk_get should not be called from within interrupt context.
  */
 struct clk *clk_get(struct device *dev, const char *id);
 
@@ -76,6 +78,8 @@ unsigned long clk_get_rate(struct clk *clk);
  * Note: drivers must ensure that all clk_enable calls made on this
  * clock source are balanced by clk_disable calls prior to calling
  * this function.
+ *
+ * clk_put should not be called from within interrupt context.
  */
 void clk_put(struct clk *clk);