diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-18 21:58:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-18 21:58:29 +0200 |
| commit | 40df43a17f3c465988ae96e61e1b8a31b78b76c2 (patch) | |
| tree | d5bc6c973aa1dd553648b4f1413de6f3e7df7b13 /scripts | |
| parent | Revert "ACPI: Make ACPI interrupt threaded" (diff) | |
| parent | libata: forbid port runtime pm by default, fixing regression (diff) | |
| download | linux-40df43a17f3c465988ae96e61e1b8a31b78b76c2.tar.xz linux-40df43a17f3c465988ae96e61e1b8a31b78b76c2.zip | |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libara fixes from Jeff Garzik:
- Notable regression fix. Forbid dynamic runtime power management by
default, due to issues with suspend/resume and hotplug.
To re-enable, use sysfs.
- make ata_print_id atomic, due to ref from multiple contexts
- sata_mv warning fix
- ata_piix new PCI ID
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: forbid port runtime pm by default, fixing regression
libata: make ata_print_id atomic
sata_mv: silence an uninitialized variable warning
ata_piix: IDE-mode SATA patch for Intel DH89xxCC DeviceIDs
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions