Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
authorPaul Mackerras <paulus@samba.org>
Wed, 22 Mar 2006 02:46:53 +0000 (13:46 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 22 Mar 2006 02:46:53 +0000 (13:46 +1100)

Trivial merge