Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
authorPaul Mackerras <paulus@samba.org>
Sat, 22 Apr 2006 09:47:47 +0000 (19:47 +1000)
committerPaul Mackerras <paulus@samba.org>
Sat, 22 Apr 2006 09:47:47 +0000 (19:47 +1000)

Trivial merge