aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:04:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:04:02 -0800
commitf91b22c35f6b0ae06ec5b67922eca1999c3b6e0a (patch)
treeb9a87ce1bf41e3b7535c7feddbf402b9380090aa /kernel
parent847f9c606cad121cebf984639e3eeee1c4db82f8 (diff)
parente03bcb68629c7f0728c95f1afe06ce48565c7713 (diff)
parent9ca94d7c016130f9ed77f142424ace9c19742809 (diff)
parent8b833c506c05c498d4215e2c260be44225daf6de (diff)
parentf266d7f5f89652a68e21e9882c44ee9104ad8d61 (diff)
parent016ddd9b5b315fe52ac6ba3167521f50b3868d34 (diff)
parent477346ff74f4c2aed50e8a0db96a61069f3e5b80 (diff)
parent2854e72b58dad82f5248b30a45dda0df49e5fe05 (diff)
Merge branches 'core-ipi-for-linus', 'core-locking-for-linus', 'tracing-fixes-for-linus', 'x86-debug-for-linus', 'x86-doc-for-linus', 'x86-gpu-for-linus' and 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: plist: Fix grammar mistake, and c-style mistake * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kprobes: Add mcount to the kprobes blacklist * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86_64: Print modules like i386 does * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Put 'nopat' in kernel-parameters * 'x86-gpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64: Allow fbdev primary video code * 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Use helpers for rlimits