| commit | af0900537f90b58fcfb7a7c821c661be8301fc9b | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Mon Oct 29 05:48:33 2007 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Mon Oct 29 05:48:33 2007 -0400 |
| tree | 21db97896616700099944c8591d5a4a99235fe16 | |
| parent | 3830de73000c07b2cbdf8cc31a46a01dda28c5df [diff] | |
| parent | d1417862d7355f0b395d83f2884afd614b086695 [diff] |
Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes