Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:25:02 +0000 (17:25 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:25:02 +0000 (17:25 -0400)

Trivial merge