| commit | a7c2491a13cc72fc09c062e635b9a77ff6bb4a73 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sat Dec 24 11:55:16 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sat Dec 24 11:55:16 2005 -0800 |
| tree | f8f4ed7bbc05369aadfd32668b892fe2740a0f3b | |
| parent | 1836098f97d22c81652aeeec64d1819dc2177bdb [diff] | |
| parent | 3df3cc6d18b6dcd38c33c198fb8adf1f1fa5f4a7 [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6