tree b9a87ce1bf41e3b7535c7feddbf402b9380090aa
parent 847f9c606cad121cebf984639e3eeee1c4db82f8
parent e03bcb68629c7f0728c95f1afe06ce48565c7713
parent 9ca94d7c016130f9ed77f142424ace9c19742809
parent 8b833c506c05c498d4215e2c260be44225daf6de
parent f266d7f5f89652a68e21e9882c44ee9104ad8d61
parent 016ddd9b5b315fe52ac6ba3167521f50b3868d34
parent 477346ff74f4c2aed50e8a0db96a61069f3e5b80
parent 2854e72b58dad82f5248b30a45dda0df49e5fe05
author Linus Torvalds <torvalds@linux-foundation.org> 1267380242 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267380242 -0800

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