diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-29 22:35:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-29 22:35:04 +0100 |
| commit | 8cf126d92791381632818df862fdbc89ab6f7572 (patch) | |
| tree | 4118af6b25e3d8cac90a4ec63918f869671c2109 /block/blk-sysfs.c | |
| parent | Merge tag 'pm+acpi-3.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | x86/efi: Don't select EFI from certain special ACPI drivers (diff) | |
| download | linux-8cf126d92791381632818df862fdbc89ab6f7572.tar.xz linux-8cf126d92791381632818df862fdbc89ab6f7572.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"There is a small EFI fix and a big power regression fix in this batch.
My queue also had a fix for downing a CPU when there are insufficient
number of IRQ vectors available, but I'm holding that one for now due
to recent bug reports"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Don't select EFI from certain special ACPI drivers
x86 idle: Repair large-server 50-watt idle-power regression
Diffstat (limited to 'block/blk-sysfs.c')
0 files changed, 0 insertions, 0 deletions