Merge branch 'via-velocity' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorJeff Garzik <jeff@garzik.org>
Thu, 7 Aug 2008 06:05:01 +0000 (02:05 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 7 Aug 2008 06:05:01 +0000 (02:05 -0400)
commit8bad4afe1257585967a1b38cd3f21324b260812b
treeff88d4b96d9bd47609d403537aac2931dd498774
parentf71eb1a24a8cdde8d388c8f93e935aa7ac491047
parent3c4dc7115dfdb9e0450b7a3b0649948f5356d4af
Merge branch 'via-velocity' of git://git./linux/kernel/git/romieu/netdev-2.6 into tmp