summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 02:49:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 02:49:35 +0200
commit17b141803c6c6e27fbade3f97c1c9d8d66c72866 (patch)
tree23ecc0e41e4b742883ee800a4725beff234d2eaa /arch/um
parentMerge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentx86, apic: Print verbose error interrupt reason on apic=debug (diff)
parentx86: Demacro CONFIG_PARAVIRT cpu accessors (diff)
parentx86: Fix mrst sparse complaints (diff)
downloadlinux-17b141803c6c6e27fbade3f97c1c9d8d66c72866.tar.xz
linux-17b141803c6c6e27fbade3f97c1c9d8d66c72866.zip
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