commit bb4899dbef2650288d20251a736243472f050d8b
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Apr 04 08:44:40 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Apr 04 08:44:40 2007 -0700
tree dde7f4d5f1c465fee1d39eecb9151e65280ce06b
parent 36e337d0244ddcf4317f7d7c1144b9adfc8e5e3a
parent 6f23a31d1cbe791a1ce86ffa9b23251ab0a1ef45

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Limit ATAPI DMA to R/W commands only for TORiSAN DVD drives (take 3)
  libata: Limit max sector to 128 for TORiSAN DVD drives (take 3)
  libata: Clear tf before doing request sense (take 3)
  libata: reorder HSM_ST_FIRST for easier decoding (take 3)
  libata bugfix: preserve LBA bit for HDIO_DRIVE_TASK
  2.6.21 fix lba48 bug in libata fill_result_tf()