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:
  ahci: redo stopping DMA engines on empty ports
  sata_sil24: fix kernel panic on ARM caused by unaligned access in sata_sil24
  ahci: add pci quirk for JMB362
  sata_via: explain the magic fix

...

This commit is contained in:

Linus Torvalds 2010-06-07 17:09:03 -07:00

parent cfca31ce78 0ee7195272

commit 4d3d769c60

5 changed files with 30 additions and 27 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

21

drivers/ata/libahci.c

View file

12

drivers/ata/sata_sil24.c

View file

18

drivers/ata/sata_via.c

View file

5

drivers/pci/quirks.c

View file

1

include/linux/pci_ids.h

View file