diff --git a/[refs] b/[refs]
index 66dcab37edab..bdb641a04ee7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab2febd4d3c6f50545cee11a116536a09748d59
+refs/heads/master: c6e82e72361db12759fdcdbfd3b598acb6b34b07
diff --git a/trunk/include/mtd/mtd-abi.h b/trunk/include/mtd/mtd-abi.h
index b5994ea56a5a..9fd8c720a803 100644
--- a/trunk/include/mtd/mtd-abi.h
+++ b/trunk/include/mtd/mtd-abi.h
@@ -7,8 +7,9 @@
 #ifndef __MTD_ABI_H__
 #define __MTD_ABI_H__
 
-#ifndef __KERNEL__ /* Urgh. The whole point of splitting this out into
-		    separate files was to avoid #ifdef __KERNEL__ */
+#ifndef __KERNEL__ 
+/* Urgh. The whole point of splitting this out into
+   separate files was to avoid #ifdef __KERNEL__ */
 #define __user
 #endif