| commit | e67b23c71cb9ee02d65a74c3858716ba2dedd554 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Nov 18 12:23:07 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Nov 18 12:23:07 2005 -0800 |
| tree | 17cfeadd37b93ca758aa3ffb61e02edf62289aea | |
| parent | d4bf205305a9188894ac4e2e9875e42f9f8eabfd [diff] | |
| parent | f7492f17f2123f0f4db5f9e8ba89867a7b352658 [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6