Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] mpc5200: Fix incorrect compatible string for the mdio node
  [POWERPC] Update some defconfigs
This commit is contained in:
Linus Torvalds 2008-03-24 20:35:48 -07:00
commit 7c12c92fba
39 changed files with 3032 additions and 1267 deletions