Merge branch 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libat...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:58:20 +0000 (11:58 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:58:20 +0000 (11:58 -0700)
commit4750def52cb2c21732dda9aa1d43a07db37b0186
tree29fd6223665faabb593f8ae1f4f626685f425ff9
parent9028780a3e6d2c3dd940e89b377765cca008b6df
parent27c78b372d05e47bbd059c9bb003c6d716abff54
Merge branch 'reset-seq' of /linux/kernel/git/jgarzik/libata-dev

* 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata reset-seq] build and merge fixes
  libata: reimplement reset sequencing
  libata: improve ata_std_prereset()
  libata: improve 0xff status handling
  libata: add deadline support to prereset and reset methods