Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
authorPaul Mackerras <paulus@samba.org>
Tue, 28 Mar 2006 06:02:14 +0000 (17:02 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Mar 2006 06:02:14 +0000 (17:02 +1100)

Trivial merge