diff --git a/[refs] b/[refs]
index c23a6bb68da1..9f9b66228da1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67306da610a3e4824192e92888634d3d8700bfc1
+refs/heads/master: 1ada1441e73a0f51296bfae527acbeae61ff0d52
diff --git a/trunk/Documentation/arm/mem_alignment b/trunk/Documentation/arm/mem_alignment
index d145ccca169a..c7c7a114c78c 100644
--- a/trunk/Documentation/arm/mem_alignment
+++ b/trunk/Documentation/arm/mem_alignment
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user
 space, and might cause programs to fail unexpectedly.
 
 To change the alignment trap behavior, simply echo a number into
-/proc/sys/debug/alignment.  The number is made up from various bits:
+/proc/cpu/alignment.  The number is made up from various bits:
 
 bit		behavior when set
 ---		-----------------