Merge branch 'linus' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Feb 2009 13:42:54 +0000 (14:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Feb 2009 13:42:54 +0000 (14:42 +0100)
commit0464ac9ebd90cfd5792d3c1158af848281b7eb09
treeab4419845b9e7ae3417741f34cfab6acd00754aa
parent0973a06cde8cc1522fbcf2baacb926f1ee3f4c79
parent9be260a646bf76fa418ee519afa10196b3164681
Merge branch 'linus' into x86/mm

Conflicts:
arch/x86/mm/fault.c
arch/x86/mm/fault.c