Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
authorPaul Mackerras <paulus@samba.org>
Tue, 9 Dec 2008 03:58:37 +0000 (14:58 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 9 Dec 2008 03:58:37 +0000 (14:58 +1100)

Trivial merge