commit | dd32f7effdd2f3f348ef91ca1649d78a0ab2b103 | [log] [tgz] |
---|---|---|
author | Jeff Garzik <jeff@garzik.org> | Tue Apr 29 01:54:31 2008 -0400 |
committer | Jeff Garzik <jgarzik@redhat.com> | Tue Apr 29 01:54:31 2008 -0400 |
tree | 059911292a94d78ba08e553d70035d89a4e7fdf5 | |
parent | 090bf62199d6079cc47c0b78ced9508391b24fa1 [diff] | |
parent | 21e197f231343201368338603cb0909a13961bac [diff] |
Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream