Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Mon, 17 Dec 2007 23:05:43 +0000 (18:05 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 17 Dec 2007 23:05:43 +0000 (18:05 -0500)

Trivial merge