Merge branch 'x86/mm' into core/percpu

Conflicts: arch/x86/mm/fault.c
2009-01-21 10:39:51 +01:00
parent 4ec71fa2d2 92181f190b
commit 198030782c
527 changed files with 8252 additions and 3743 deletions
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -1,4 +1,3 @@
 include include/asm-generic/Kbuild.asm

 header-y += cachectl.h sgidefs.h sysmips.h
-header-y += swab.h
--- a/arch/mips/include/asm/byteorder.h
+++ b/arch/mips/include/asm/byteorder.h
@@ -8,8 +8,6 @@
 #ifndef _ASM_BYTEORDER_H
 #define _ASM_BYTEORDER_H

-#include <asm/swab.h>
-
 #if defined(__MIPSEB__)
 #include <linux/byteorder/big_endian.h>
 #elif defined(__MIPSEL__)