| commit | d779188d2baf436e67fe8816fca2ef53d246900f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jan 04 16:31:56 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jan 04 16:31:56 2006 -0800 |
| tree | 9bac75842a5611172860feec3c4019ff874a2b89 | |
| parent | f61ea1b0c825a20a1826bb43a226387091934586 [diff] | |
| parent | ac67c6247361b3b8644b34e5301a46d5069c1373 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6