Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
authorPaul Mackerras <paulus@samba.org>
Tue, 13 Feb 2007 02:28:00 +0000 (13:28 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 13 Feb 2007 02:28:00 +0000 (13:28 +1100)

Trivial merge