| commit | f327220b1494aa23fd4206ac4778b8aa449a3351 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Dec 01 15:49:37 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Dec 01 15:49:37 2005 -0800 |
| tree | b463d2541db1638c7cb8b9ff10a9238fc8a47000 | |
| parent | 31b3c31bca3b4df975631323d6ee6f49f43f4956 [diff] | |
| parent | ea182d4aefa3a27847d890b1592a608d1180aa45 [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6