Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc...
authorPaul Mackerras <paulus@samba.org>
Tue, 28 Apr 2009 00:47:16 +0000 (10:47 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Apr 2009 00:47:16 +0000 (10:47 +1000)

Trivial merge