Merge branch 'ipg-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorJeff Garzik <jeff@garzik.org>
Fri, 18 Jan 2008 19:39:26 +0000 (14:39 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 18 Jan 2008 19:39:26 +0000 (14:39 -0500)

Trivial merge