Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jun 2013 19:06:48 +0000 (09:06 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jun 2013 19:06:48 +0000 (09:06 -1000)
commitad465470563152f8dcc61161148ff620efefb2a8
treec988264bff14e710f93b3612835289903806efc5
parent5dbc746960b5cd62c558cd6663697afd41f59d39
parentb37e161388ac3980d5dfb73050e85874b84253eb
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc bugfix from Ben Herrenschmidt:
 "This is a fix for a regression causing a freescale "83xx" based
  platforms to crash on boot due to some PCI breakage"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/pci: Fix boot panic on mpc83xx (regression)