| commit | 0827f2b698735aee7cfb2990d393a82f6e1690eb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jan 31 10:29:35 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jan 31 10:29:35 2006 -0800 |
| tree | 5eb1fa871154ab36c38794c4dc488698f13c71e0 | |
| parent | 70b4d63e98fd93fb9742708a54f872cba24e0fea [diff] | |
| parent | c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6