tree ad9fe2294b45562b434bf7cf9e387624057bbd65
parent 9dda696f0de87a2e5cfabb147e28c76b7d3c6846
parent 43c9c59185eec7caaff6e9dd8d4c93a4d9836a86
author Linus Torvalds <torvalds@linux-foundation.org> 1275010498 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275010498 -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:
  libata: implement dump_id force param
  libata: disable ATAPI AN by default
  libata-sff: make BMDMA optional
  libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf
  libata-sff: separate out BMDMA init
  libata-sff: separate out BMDMA irq handler
  libata-sff: ata_sff_irq_clear() is BMDMA specific
  sata_mv: drop unncessary EH callback resetting