aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/buffer_sync.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2010-10-30 01:58:00 +0000
committerLinus Torvalds <[email protected]>2010-10-30 01:58:00 +0000
commit2d10d8737ccdba752d60106abbc6ed4f37404923 (patch)
tree29bbceccd926e4b9bf0d7e7e7778e6bf5c012cc1 /drivers/oprofile/buffer_sync.c
parentMerge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kerne... (diff)
parentx86, alternative: Call stop_machine_text_poke() on all cpus (diff)
parentx86, uv: More Westmere support on SGI UV (diff)
downloadkernel-2d10d8737ccdba752d60106abbc6ed4f37404923.tar.gz
kernel-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