commit 494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b
author Linus Torvalds <torvalds@linux-foundation.org> Sat Aug 28 13:54:55 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Aug 28 13:54:55 2010 -0700
tree bda9ccabb49502ea64427c2958a69b7aa9069c6b
parent f18194275c39835cb84563500995e0d503a32d9a
parent 55ee67f837882f28a900705a2ca1af257ab6c53d

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-sff: remove harmful BUG_ON from ata_bmdma_qc_issue
  sata_mv: fix broken DSM/TRIM support (v2)
  libata: be less of a drama queen on empty data commands
  [libata] sata_dwc_460ex: signdness bug
  ahci: add HFLAG_YES_FBS and apply it to 88SE9128
  libata: remove no longer needed pata_winbond driver
  pata_cmd64x: revert commit d62f5576