| commit | 090bf62199d6079cc47c0b78ced9508391b24fa1 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Tue Apr 29 01:45:04 2008 -0400 |
| committer | Jeff Garzik <jgarzik@redhat.com> | Tue Apr 29 01:45:04 2008 -0400 |
| tree | 49f473dfdd76a8d7cd1617b591e7fddb44a51fbe | |
| parent | 8ceee660aacb29721e26f08e336c58dc4847d1bd [diff] | |
| parent | 697c269610179051cf19e45566fee3dcebbb1e93 [diff] |
Merge branch 'sis190' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream