Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Mar 2008 03:35:48 +0000 (20:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Mar 2008 03:35:48 +0000 (20:35 -0700)
commit7c12c92fba4bd985ed6d909e5537468b268dcaa4
tree569639a44c52335eefa1029f922a5eca8c40362e
parent5a17558f06993fdc509362f659582b52b0f921e3
parent16fddf5457d2a7eb5e96ceb016a8f722eca97af6
Merge branch 'merge' of git://git./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