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

This commit is contained in:
Paul Mackerras 2009-04-28 10:47:16 +10:00
commit de60fba2bb
2 changed files with 44 additions and 14 deletions