| commit | 801c0be81454901e02c49abe12929c67e7d1cb55 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Feb 26 06:31:23 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Feb 26 06:31:23 2009 +0100 |
| tree | 749cb64a2829b174e6d5df76da756285e7554002 | |
| parent | 13b2eda64d14d0a0c15c092664c7351ea58ea851 [diff] | |
| parent | 13093cb0e59053bf97910de3a24f07cdff71c62c [diff] |
Merge branches 'x86/urgent' and 'x86/pat' into x86/core Conflicts: arch/x86/include/asm/pat.h