| commit | 0edcf8d6926f4038443dbc24e319530177ca0353 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Feb 24 21:52:45 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Feb 24 21:52:45 2009 +0100 |
| tree | 6010af62f73d01ab673d5106f310eaf4f4228e32 | |
| parent | 87b203079ed949de52f0d92aeae20e5e0116c12f [diff] | |
| parent | 40150d37be7f7949b2ec07d511244da856647d84 [diff] |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu Conflicts: arch/x86/include/asm/pgtable.h