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)
commitab320af2244462703455dac59fe5ceede24d3662
treefed3f31755d2c69a3c9f05e64f192dae208b208a
parentb0483e78e5c4c9871fc5541875b3bc006846d46b
parentd1d47ec6e62ab08d2ebb925fd9203abfad3adfbf
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

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