tree 510f558d44a3c10ed4acdeb9bd09e81e775a429e
parent 1be62dc190ebaca331038962c873e7967de6cc4b
parent 8243e636c060fe7c10c9cf3bf53fdd2d48901525
author Linus Torvalds <torvalds@linux-foundation.org> 1207345204 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207345204 -0700

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

* '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()