Merge branches 'x86/urgent' and 'x86/pat' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:31:23 +0000 (06:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:31:23 +0000 (06:31 +0100)
commit801c0be81454901e02c49abe12929c67e7d1cb55
tree749cb64a2829b174e6d5df76da756285e7554002
parent13b2eda64d14d0a0c15c092664c7351ea58ea851
parent13093cb0e59053bf97910de3a24f07cdff71c62c
Merge branches 'x86/urgent' and 'x86/pat' into x86/core

Conflicts:
arch/x86/include/asm/pat.h
arch/x86/include/asm/pat.h
arch/x86/mm/pat.c