| commit | d1138cf035ad5a8dc0796b213bd078a2fb92eb7c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jan 17 19:46:46 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jan 17 19:46:46 2006 -0800 |
| tree | 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b [diff] | |
| parent | 77783a78ded96a56e3a1a0c03bbe87c56896fe6e [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6