Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
authorJeff Garzik <jeff@garzik.org>
Mon, 2 Jul 2007 12:15:33 +0000 (08:15 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 2 Jul 2007 12:15:33 +0000 (08:15 -0400)

Trivial merge