diff --git a/[refs] b/[refs]
index 41abd75b7621..45063e0596ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52d90f4dad1352a6077ad6e93650ecea9b258f56
+refs/heads/master: 5cfba5df8c76851ab311a2818a5e688f20833cac
diff --git a/trunk/arch/s390/include/asm/statfs.h b/trunk/arch/s390/include/asm/statfs.h
index 099a45579190..06cc70307ece 100644
--- a/trunk/arch/s390/include/asm/statfs.h
+++ b/trunk/arch/s390/include/asm/statfs.h
@@ -12,19 +12,16 @@
 #ifndef __s390x__
 #include <asm-generic/statfs.h>
 #else
+/*
+ * We can't use <asm-generic/statfs.h> because in 64-bit mode
+ * we mix ints of different sizes in our struct statfs.
+ */
 
 #ifndef __KERNEL_STRICT_NAMES
-
 #include <linux/types.h>
-
 typedef __kernel_fsid_t	fsid_t;
-
 #endif
 
-/*
- * This is ugly -- we're already 64-bit clean, so just duplicate the 
- * definitions.
- */
 struct statfs {
 	int  f_type;
 	int  f_bsize;