aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 18:58:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 18:58:00 -0700
commit2d10d8737ccdba752d60106abbc6ed4f37404923 (patch)
tree29bbceccd926e4b9bf0d7e7e7778e6bf5c012cc1
parentc0f62edd400115e54c52692c1dc6f5bf58ea0ba6 (diff)
parent404ba5d7bb958d3d788bdaa0debc0bdf60f13ffe (diff)
parent0520bd8438f18f2b1b2af5fd1c4ecc070a1bf837 (diff)
downloadkernel_samsung_crespo-2d10d8737ccdba752d60106abbc6ed4f37404923.zip
kernel_samsung_crespo-2d10d8737ccdba752d60106abbc6ed4f37404923.tar.gz
kernel_samsung_crespo-2d10d8737ccdba752d60106abbc6ed4f37404923.tar.bz2
Merge branches 'x86-fixes-for-linus' and 'x86-uv-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, alternative: Call stop_machine_text_poke() on all cpus x86-32: Restore irq stacks NUMA-aware allocations x86, memblock: Fix early_node_mem with big reserved region. * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, uv: More Westmere support on SGI UV x86, uv: Enable Westmere support on SGI UV