From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Apr 2010 02:46:29 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: android-x86-2.2~1225
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d5a30458a90597915977f06e79406b664a41b8ac;p=android-x86%2Fkernel.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: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf.
  libata: fix docs, RE port and device of libata.force ID separated by point
  pata_pcmcia/ide-cs: add IDs for transcend and kingston cards
  libata: fix locking around blk_abort_request()
---

d5a30458a90597915977f06e79406b664a41b8ac