From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2010 20:54:55 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.0~3491
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'upstream-linus' of git://git./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
---

494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b