| commit | e5dfa9282f3db461a896a6692b529e1823ba98c6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 28 09:05:25 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 28 09:05:25 2005 -0700 |
| tree | 574d23cebc57c657373b0e1b6692c047aba8dd6e | |
| parent | 5dd962494f76fb3ef1196cd420b5d6260d7a3766 [diff] | |
| parent | b2ab040db85835e54c7559533df7f85902617926 [diff] |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6