diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 00:47:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 00:47:57 +0200 |
| commit | 1d7746cb411d8b10c0ac934cae6c58bd1ece9616 (patch) | |
| tree | c8734c58ccd1d57667f69db4559296b59ec30318 /net/9p | |
| parent | Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs (diff) | |
| download | linux-1d7746cb411d8b10c0ac934cae6c58bd1ece9616.tar.xz linux-1d7746cb411d8b10c0ac934cae6c58bd1ece9616.zip | |
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
Diffstat (limited to 'net/9p')
0 files changed, 0 insertions, 0 deletions