Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Feb 2010 16:07:54 +0000 (08:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Feb 2010 16:07:54 +0000 (08:07 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem
  powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards


Trivial merge