Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Sun, 21 Sep 2008 23:18:21 +0000 (18:18 -0500)
committerPaul Mackerras <paulus@samba.org>
Sun, 21 Sep 2008 23:18:21 +0000 (18:18 -0500)

Trivial merge