diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-25 21:06:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-25 21:06:48 +0200 |
commit | ad465470563152f8dcc61161148ff620efefb2a8 (patch) | |
tree | c988264bff14e710f93b3612835289903806efc5 /arch/sh | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz... (diff) | |
parent | powerpc/pci: Fix boot panic on mpc83xx (regression) (diff) | |
download | linux-ad465470563152f8dcc61161148ff620efefb2a8.tar.xz linux-ad465470563152f8dcc61161148ff620efefb2a8.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/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)
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions