Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc...
authorPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 05:08:14 +0000 (16:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 05:08:14 +0000 (16:08 +1100)

Trivial merge