Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

This commit is contained in:
Paul Mackerras 2008-11-24 11:53:58 +11:00
commit be542fa56b
2 changed files with 20 additions and 3 deletions