Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
authorPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 10:34:56 +0000 (21:34 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 10:34:56 +0000 (21:34 +1100)

Trivial merge