tree 569639a44c52335eefa1029f922a5eca8c40362e
parent 5a17558f06993fdc509362f659582b52b0f921e3
parent 16fddf5457d2a7eb5e96ceb016a8f722eca97af6
author Linus Torvalds <torvalds@linux-foundation.org> 1206416148 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206416148 -0700

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