| commit | 6d6585e490d985d421d7cd3cfc7d77b618c44130 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Feb 27 07:41:11 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Feb 27 07:41:11 2006 -0800 |
| tree | bf8c941eec540f0e30a37252be031c5504a24e16 | |
| parent | b9a33cebac70d6f67a769ce8d4078fee2b254ada [diff] | |
| parent | 7bef4b397874eee4484457040e8a1013361d7758 [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6