| commit | 7cd082f0147c5fc94b455bcc17fe21b22dbac703 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Dec 12 21:42:17 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Dec 12 21:42:17 2005 -0800 |
| tree | 642dcf3b36d563aa7bb070a2a9355805483e857a | |
| parent | b11d0e48aa41b644143ca526ef8d69212fdc1cdd [diff] | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6