tree c3aeafc3e7f0fc91711b77ab95c018f684a05aea
parent ff2bad5f899421850f7e9bc956450e4c61b0b95d
parent b98f5046397b9f4c5060e5b73e483bfd9e453dd6
author Linus Torvalds <torvalds@linux-foundation.org> 1233071242 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233071242 -0800

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-rb532-cf: remove set_irq_type from finish_io
  [libata] pata_via: support VX855, future chips whose IDE controller use 0x0571
  sata_mv: no longer experimental (v2)
  sata_mv: msi masking fix (v2)
  sata_mv: Properly initialize main irq mask
  sata_mv: remove bogus nsect restriction
  sata_mv: don't read hc_irq_cause
  sata_mv: fix 8-port timeouts on 508x/6081 chips
  sata_nv: fix MCP5x reset
  sata_nv: rename nv_nf2_hardreset()
  libata: set NODEV_HINT for 0x7f status
  libata-sff: fix incorrect EH message