summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 17:49:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 17:49:35 -0700
commit17b141803c6c6e27fbade3f97c1c9d8d66c72866 (patch)
tree23ecc0e41e4b742883ee800a4725beff234d2eaa /arch
parent78c4def67e8eebe602655a3dec9aa08f0e2f7c4b (diff)
parent2b398bd9f8f73be706b41adcbb240ce95793049a (diff)
parent15d6aba24d88231415f4e7e091c0f1e60c3e6fd5 (diff)
parent8fab6af2156c0100f953fd61f4e0b2f82c9776dc (diff)
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