diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-25 10:28:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-25 10:28:19 -0700 |
| commit | da31ce727e8cc6920de5840e35b4e770c08e86e3 (patch) | |
| tree | accf2e15d59c3717aad36b73dac31029dfc42853 /drivers/block/drbd | |
| parent | 2d809dcd88f590d68dd741dc4d28a84128449fbd (diff) | |
| parent | d17d794c63e2dc0a5b1ffc8367c9475880427fc7 (diff) | |
| download | linux-da31ce727e8cc6920de5840e35b4e770c08e86e3.tar.gz linux-da31ce727e8cc6920de5840e35b4e770c08e86e3.tar.bz2 linux-da31ce727e8cc6920de5840e35b4e770c08e86e3.zip | |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata fixes from Jeff Garzik:
- libata-acpi regression fix
- additional or corrected drive quirks for ata_blacklist
- Kconfig text tweaking
- new PCI IDs
- pata_atiixp: quirk for MSI motherboard
- export ahci_dev_classify for an ahci_platform driver
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Add a space to " 2GB ATA Flash Disk" DMA blacklist entry
[libata] new quirk, lift bridge limits for Buffalo DriveStation Quattro
[libata] Kconfig: Elaborate that SFF is meant for legacy and PATA stuff
[libata] acpi: call ata_acpi_gtm during ata port init time
ata_piix: Add Device IDs for Intel Lynx Point-LP PCH
ahci: Add Device IDs for Intel Lynx Point-LP PCH
pata_atiixp: override cable detection on MSI E350DM-E33
ahci: un-staticize ahci_dev_classify
Diffstat (limited to 'drivers/block/drbd')
0 files changed, 0 insertions, 0 deletions