diff --git a/[refs] b/[refs]
index cbbeb9d08f4a..0c1643bbe5ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd8e526f44beaf439f351b310648b559e62a7cb
+refs/heads/master: c82a5cb8b2b2ce15f1fb8add6772921b72da5943
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index f4f8d19158e4..b94c0e4efe24 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -126,7 +126,7 @@ typedef		__s64		int64_t;
 #endif
 
 /* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#define aligned_u64 __u64 __attribute__((aligned(8)))
 #define aligned_be64 __be64 __attribute__((aligned(8)))
 #define aligned_le64 __le64 __attribute__((aligned(8)))