summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-25 19:06:48 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-25 19:06:48 (GMT)
commitad465470563152f8dcc61161148ff620efefb2a8 (patch)
treec988264bff14e710f93b3612835289903806efc5 /fs/xfs
parent5dbc746960b5cd62c558cd6663697afd41f59d39 (diff)
parentb37e161388ac3980d5dfb73050e85874b84253eb (diff)
downloadlinux-fsl-qoriq-ad465470563152f8dcc61161148ff620efefb2a8.tar.xz
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 'fs/xfs')
0 files changed, 0 insertions, 0 deletions