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

Browse source

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] ahci: add ATI SB800 PCI IDs
  libata-sff: Fix documentation
  libata: Update the blacklist with a few more devices

...

This commit is contained in:

Linus Torvalds 2007-09-20 13:25:35 -07:00

parent b8fceee17a c69c0892d8

commit 335fb8fc71

3 changed files with 14 additions and 5 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

10

drivers/ata/ahci.c

View file

4

drivers/ata/libata-core.c

View file

5

drivers/ata/libata-sff.c

View file