From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2008 03:35:48 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.25-rc7~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7c12c92fba4bd985ed6d909e5537468b268dcaa4;p=~shefty%2Frdma-dev.git

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
---

7c12c92fba4bd985ed6d909e5537468b268dcaa4