From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 May 2010 22:47:57 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.34-rc7~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d7746cb411d8b10c0ac934cae6c58bd1ece9616;p=platform%2Fupstream%2Fkernel-adaptation-pc.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:
  pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs
  libata: Fix several inaccuracies in developer's guide
---

1d7746cb411d8b10c0ac934cae6c58bd1ece9616