| commit | 67d2b48e20bfc82f8fdb5410c28564b8b058fcab | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Oct 12 19:07:19 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Oct 12 19:07:19 2005 -0700 |
| tree | e7f6c54ee8d29893af37dc089a25a7ab24876b05 | |
| parent | d8e998c58a870770905495a1d45ebf7285b5b1c5 [diff] | |
| parent | 875521ddccfa90d519cf31dfc8aa472f7f6325bb [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6