Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: set queue DMA alignment to sector size for ATAPI too
  libata: DVR-212D can't do SETXFER DVD-RW DVR-212D
  ahci: add HFLAG_YES_FBS and apply it to 88SE9128
  pata_hpt37x: inherit prereset() method for HPT374
  ahci: AHCI mode SATA patch for Intel DH89xxCC DeviceIDs
  pata_hpt37x: fold 'if' statement into 'switch'
  pata_hpt{37x|3x2n}: use pr_*(DRV_NAME ...) instead of printk(KERN_* ...)
  pata_hpt{366|37x}: use pr_warning(...) instead of printk(KERN_WARNING ...)
  pata_mpc52xx: inherit from ata_bmdma_port_ops

...

This commit is contained in:

Linus Torvalds 2011-01-31 12:51:28 +10:00

parent ef9f2fa17f 729a6a300e

commit f9a3d1d74b

7 changed files with 85 additions and 75 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/ata/ahci.c

View file

1

drivers/ata/libata-core.c

View file

24

drivers/ata/libata-scsi.c

View file

6

drivers/ata/pata_hpt366.c

View file

112

drivers/ata/pata_hpt37x.c

View file

12

drivers/ata/pata_hpt3x2n.c

View file

2

drivers/ata/pata_mpc52xx.c

View file