Merge branch 'x86/urgent' into x86/pat
authorIngo Molnar <mingo@elte.hu>
Fri, 22 Aug 2008 04:06:51 +0000 (06:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 22 Aug 2008 04:06:51 +0000 (06:06 +0200)
commit8b53b57576292b92b27769f9e213df19b6e57786
treecd851ce4fa71b2653f120d7f11a9c6cbcf311b19
parentab7e79243746e2a9c5f00243e60108189c44c9eb
parent38cc1c3df77c1bb739a4766788eb9fa49f16ffdf
Merge branch 'x86/urgent' into x86/pat

Conflicts:
arch/x86/mm/pageattr.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/pageattr-test.c
arch/x86/mm/pageattr.c
arch/x86/mm/pat.c
drivers/char/agp/agp.h
drivers/char/agp/generic.c
drivers/char/agp/intel-agp.c