| commit | d20dc4d5231592b25a0d77c45ebb7c05204dfb3a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 21 10:01:03 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 21 10:01:03 2011 -0700 |
| tree | 2952b4ff16c6884aff5ab879d7c4a778e7f008f2 | |
| parent | d76c8420c3cf8e468901b0bd58306637335c98ea [diff] | |
| parent | 7a6c6547825a2324faa76cff856db11d78de075e [diff] |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, numa: Fix cpu nodemasks for NUMA emulation and CONFIG_DEBUG_PER_CPU_MAPS Revert "x86, NUMA: Fix fakenuma boot failure"