| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Oct 10 19:30:08 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Oct 10 19:30:08 2008 +0200 |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 [diff] | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 [diff] |
Merge branch 'linus' into x86/pat2 Conflicts: arch/x86/mm/init_64.c