Merge branch 'sis190' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...
commit090bf62199d6079cc47c0b78ced9508391b24fa1
authorJeff Garzik <jeff@garzik.org>
Tue, 29 Apr 2008 05:45:04 +0000 (29 01:45 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 29 Apr 2008 05:45:04 +0000 (29 01:45 -0400)
tree49f473dfdd76a8d7cd1617b591e7fddb44a51fbe
parent8ceee660aacb29721e26f08e336c58dc4847d1bd
parent697c269610179051cf19e45566fee3dcebbb1e93
Merge branch 'sis190' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream