Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Paul Mackerras [Wed, 22 Mar 2006 02:46:53 +0000 (13:46 +1100)]

Trivial merge