summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/segment.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-13 04:59:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-13 04:59:05 +0100
commita6da83f98267bc8ee4e34aa899169991eb0ceb93 (patch)
tree84c228e0a87475dbdb0f72621c137cce8253131b /fs/nilfs2/segment.c
parentMerge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff)
parentpowerpc: Check return value of instance-to-package OF call (diff)
downloadlinux-a6da83f98267bc8ee4e34aa899169991eb0ceb93.tar.xz
linux-a6da83f98267bc8ee4e34aa899169991eb0ceb93.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fix from Ben Herrenschmidt: "Here's one regression fix for 3.13 that I would appreciate if you could still pull in. It was an "interesting" one to debug, basically it's an old bug that got somewhat "exposed" by new code breaking the boot on PA Semi boards (yes, it does appear that some people are still using these!)" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Check return value of instance-to-package OF call
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions