summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/alternative.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-06 22:11:50 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-06 22:11:50 +0300
commit47935a731b7b850a4c6c0e55ed0741e3dd25d889 (patch)
tree6f5a97961f8e73e325d2bc1d6fb1899ad8f7d8e9 /arch/x86/include/asm/alternative.h
parent77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 (diff)
parent3fb82d56ad003e804923185316236f26b30dfdd5 (diff)
parentfd35fbcdd1b2579a6e00a1545f7124e4005d0474 (diff)
parent9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 (diff)
parentc8217b8305e5e75c23617f2f4cd262527d952c0a (diff)
parent3cf9b85b474e656a0856b88290c7a289ac5ea247 (diff)
parentf6cd24777513fcc673d432cc29ef59881d3e4df1 (diff)
downloadlinux-47935a731b7b850a4c6c0e55ed0741e3dd25d889.tar.xz
Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for-linus', 'x86-paravirt-for-linus', 'core-locking-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64, asm: Use fxsaveq/fxrestorq in more places * 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hwmon: Add core threshold notification to therm_throt.c * 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, paravirt: Use native_halt on a halt, not native_safe_halt * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking, lockdep: Convert sprintf_symbol to %pS * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: Better struct irqaction layout