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
parentMerge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm (diff)
parentx86, alternative: Call stop_machine_text_poke() on all cpus (diff)
parentx86, uv: More Westmere support on SGI UV (diff)
downloadlinux-dev-2d10d8737ccdba752d60106abbc6ed4f37404923.tar.xz
linux-dev-2d10d8737ccdba752d60106abbc6ed4f37404923.zip
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