tree 23ecc0e41e4b742883ee800a4725beff234d2eaa
parent 78c4def67e8eebe602655a3dec9aa08f0e2f7c4b
parent 2b398bd9f8f73be706b41adcbb240ce95793049a
parent 15d6aba24d88231415f4e7e091c0f1e60c3e6fd5
parent 8fab6af2156c0100f953fd61f4e0b2f82c9776dc
author Linus Torvalds <torvalds@linux-foundation.org> 1305852575 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305852575 -0700

Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, apic: Print verbose error interrupt reason on apic=debug

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Demacro CONFIG_PARAVIRT cpu accessors

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix mrst sparse complaints
  x86: Fix spelling error in the memcpy() source code comment
  x86, mpparse: Remove unnecessary variable