Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
authorPaul Mackerras <paulus@samba.org>
Mon, 3 Jul 2006 21:33:28 +0000 (07:33 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 3 Jul 2006 21:33:28 +0000 (07:33 +1000)

Trivial merge