Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Sat, 15 Sep 2007 23:29:07 +0000 (19:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 15 Sep 2007 23:29:07 +0000 (19:29 -0400)

Trivial merge