| commit | 1d7746cb411d8b10c0ac934cae6c58bd1ece9616 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 05 15:47:57 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 05 15:47:57 2010 -0700 |
| tree | c8734c58ccd1d57667f69db4559296b59ec30318 | |
| parent | 65be2f501f5b31208a963713e6702d40e8e7863d [diff] | |
| parent | 85ea2d3f9e71cd72e866fdb74a9d5a15d65d44c2 [diff] |
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