diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 20:11:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 20:11:50 +0100 |
| commit | 47935a731b7b850a4c6c0e55ed0741e3dd25d889 (patch) | |
| tree | 6f5a97961f8e73e325d2bc1d6fb1899ad8f7d8e9 /drivers/net/forcedeth.c | |
| parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume (diff) | |
| parent | x86-64, asm: Use fxsaveq/fxrestorq in more places (diff) | |
| parent | x86, hwmon: Add core threshold notification to therm_throt.c (diff) | |
| parent | x86, paravirt: Use native_halt on a halt, not native_safe_halt (diff) | |
| parent | locking, lockdep: Convert sprintf_symbol to %pS (diff) | |
| parent | irq: Better struct irqaction layout (diff) | |
| download | linux-47935a731b7b850a4c6c0e55ed0741e3dd25d889.tar.xz linux-47935a731b7b850a4c6c0e55ed0741e3dd25d889.zip | |
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