Merge branch 'linus' into x86/pat2

Conflicts: arch/x86/mm/init_64.c
2008-10-10 19:30:08 +02:00
parent b27a43c1e9 d403a6484f
commit 3dd392a407
819 changed files with 9576 additions and 5697 deletions
--- a/include/asm-x86/cacheflush.h
+++ b/include/asm-x86/cacheflush.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_CACHEFLUSH_H
-#define _ASM_X86_CACHEFLUSH_H
+#ifndef ASM_X86__CACHEFLUSH_H
+#define ASM_X86__CACHEFLUSH_H

 /* Keep includes the same across arches.  */
 #include <linux/mm.h>
@@ -115,4 +115,4 @@ static inline int rodata_test(void)
 }
 #endif

-#endif
+#endif /* ASM_X86__CACHEFLUSH_H */