| commit | 5fdf193b15a08f6c32ca4eb5913fa9be788e790e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Aug 18 14:58:21 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Aug 18 14:58:21 2005 -0700 |
| tree | 0747ab5547556b7955de7bf8fcfd0fab542e790d | |
| parent | f3ed8b444781158c9c10f48a8eba6795ecec7023 [diff] | |
| parent | 2ae2d77cfa424587014cb34a89eed0ff2149fd5c [diff] |
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6