]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite62855fc2506708dc07af72db70773e189a8d015
treec8734c58ccd1d57667f69db4559296b59ec30318
parent817c071a8ca3b94934b79f5775ceed9c7e0c38dd
parentf4804521b764d1725c04a76a8adf24be3a66a404
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:
  pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs
  libata: Fix several inaccuracies in developer's guide