]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 19:11:50 +0000 (11:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 19:11:50 +0000 (11:11 -0800)
commitae613561626e27fe334afe8af1733d9062f0e47d
tree6f5a97961f8e73e325d2bc1d6fb1899ad8f7d8e9
parent69d225ca5d6999895a95e45d9204ab233ba3e056
parent227d66874955d3127df4a1be89d181d83bbe0124
parentb09ae9e100925af8d725e5d1ac74a26c6c221c0f
parent41aec1f930d18e77753390c59a0869e8b53dd459
parent5eb5a84d38cf9193e2b3aec04eee3b54daa92e15
parentf59f71bcdc9b16597c009aadf55fd636ba87aab0
parent0293df094f0cd104d1c8b753f48779ae870dff32
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
arch/x86/include/asm/alternative.h
arch/x86/include/asm/msr-index.h
arch/x86/kernel/alternative.c
arch/x86/kernel/smpboot.c
kernel/cpu.c