Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Paul Mackerras 17 years ago bfb99f82 ebdba9af