| commit | 43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jan 12 15:43:39 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jan 12 15:43:39 2006 -0800 |
| tree | 28e4c9fa3ac800e2799d48e981a25f1403c4502e | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 [diff] | |
| parent | 9f3f46b5fe83a56d380d4006dd2cd906bc186f91 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6