diff --git a/[refs] b/[refs]
index be52ce993efc..9b9c1997962f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc2eb928a1bcf6a48f40c1f2ff21b66bdbf91a3c
+refs/heads/master: 2846d84ffa4408c9810fabad74cb7aec410352fc
diff --git a/trunk/arch/arm/include/asm/fiq.h b/trunk/arch/arm/include/asm/fiq.h
index 45bb3eeeab7c..d493d0b742a1 100644
--- a/trunk/arch/arm/include/asm/fiq.h
+++ b/trunk/arch/arm/include/asm/fiq.h
@@ -4,6 +4,13 @@
  * Support for FIQ on ARM architectures.
  * Written by Philip Blundell <philb@gnu.org>, 1998
  * Re-written by Russell King
+ *
+ * NOTE: The FIQ mode registers are not magically preserved across
+ * suspend/resume.
+ *
+ * Drivers which require these registers to be preserved across power
+ * management operations must implement appropriate suspend/resume handlers to
+ * save and restore them.
  */
 
 #ifndef __ASM_FIQ_H