diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 11:11:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 11:11:50 -0800 |
| commit | 47935a731b7b850a4c6c0e55ed0741e3dd25d889 (patch) | |
| tree | 6f5a97961f8e73e325d2bc1d6fb1899ad8f7d8e9 /kernel/trace/blktrace.c | |
| parent | 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 (diff) | |
| parent | 3fb82d56ad003e804923185316236f26b30dfdd5 (diff) | |
| parent | fd35fbcdd1b2579a6e00a1545f7124e4005d0474 (diff) | |
| parent | 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 (diff) | |
| parent | c8217b8305e5e75c23617f2f4cd262527d952c0a (diff) | |
| parent | 3cf9b85b474e656a0856b88290c7a289ac5ea247 (diff) | |
| parent | f6cd24777513fcc673d432cc29ef59881d3e4df1 (diff) | |
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