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

Trivial merge