| commit | 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Mar 15 08:29:44 2011 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Mar 15 08:29:44 2011 +0100 |
| tree | 7e5f6d050b72ab08a4497e82a4a103fefb086e80 | |
| parent | 56396e6823fe9b42fe9cf9403d6ed67756255f70 [diff] | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d [diff] |
Merge commit 'v2.6.38' into x86/mm Conflicts: arch/x86/mm/numa_64.c Merge reason: Resolve the conflict, update the branch to .38. Signed-off-by: Ingo Molnar <mingo@elte.hu>