Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Paul Mackerras [Mon, 3 Jul 2006 21:33:28 +0000 (07:33 +1000)]

Trivial merge