| commit | 7ae8c5ec122e4e909193dbbdb2ad2de349e307c9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Nov 15 12:45:33 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Nov 15 12:45:33 2005 -0800 |
| tree | 42ef1a96f9286f8ddab8edd6d037506a9cbe889f | |
| parent | e1f1def6ef3f0c71d0df302c3759f6937adaf9ae [diff] | |
| parent | 9f68a24853dd37d18f2cfa979cf4e131f5a10e8f [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev