Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc...
authorPaul Mackerras <paulus@samba.org>
Wed, 17 Dec 2008 00:01:43 +0000 (11:01 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 17 Dec 2008 00:01:43 +0000 (11:01 +1100)

Trivial merge