Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Sat, 20 Oct 2007 03:04:50 +0000 (23:04 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 Oct 2007 03:04:50 +0000 (23:04 -0400)

Trivial merge