summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 06:31:23 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-26 06:31:23 +0100
commit801c0be81454901e02c49abe12929c67e7d1cb55 (patch)
tree749cb64a2829b174e6d5df76da756285e7554002 /mm
parent13b2eda64d14d0a0c15c092664c7351ea58ea851 (diff)
parent13093cb0e59053bf97910de3a24f07cdff71c62c (diff)
downloadop-kernel-dev-801c0be81454901e02c49abe12929c67e7d1cb55.zip
op-kernel-dev-801c0be81454901e02c49abe12929c67e7d1cb55.tar.gz
Merge branches 'x86/urgent' and 'x86/pat' into x86/core
Conflicts: arch/x86/include/asm/pat.h
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud