Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 22:47:57 +0000 (15:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 22:47:57 +0000 (15:47 -0700)
commit1d7746cb411d8b10c0ac934cae6c58bd1ece9616
treec8734c58ccd1d57667f69db4559296b59ec30318
parent65be2f501f5b31208a963713e6702d40e8e7863d
parent85ea2d3f9e71cd72e866fdb74a9d5a15d65d44c2
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