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:
  pata_ali: disable ATAPI DMA
  libata: ATA_12/16 doesn't fall into ATAPI_MISC
  libata: uninline atapi_cmd_type()
  libata: fix IDENTIFY order in ata_bus_probe()

...

This commit is contained in:

Linus Torvalds 2008-04-04 14:40:04 -07:00

parent 1be62dc190 8243e636c0

commit 7a5ac8def9

3 changed files with 83 additions and 23 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

41

drivers/ata/libata-core.c

View file

40

drivers/ata/pata_ali.c

View file

25

include/linux/libata.h

View file