| commit | 2ead1aa6f14ed542af0c9e2302a51ea02128f587 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 23 16:44:01 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 23 16:44:01 2005 -0700 |
| tree | dfaf465122239a8bb450913b2e95f4647d24892f | |
| parent | 7f28f394bd68e58bf3938c67bbeca7825b4687b8 [diff] | |
| parent | c8868611389aa28e0e5e0d63f468727781eac68c [diff] |
Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6