| commit | 238523e1a15874b88955ff9c8f63e35597ae2857 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Dec 12 16:41:37 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Dec 12 16:41:37 2005 -0800 |
| tree | 3a794b119a40a7dd5bd73b513297c4580a090303 | |
| parent | 1ff8038988adecfde71d82c0597727fc239d4e8c [diff] | |
| parent | 016cc85072944bfa03c5e4b587ae89588ce2e5df [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6