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)

Trivial merge