diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 20:37:49 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 20:37:49 +0100 |
commit | 22f4f7b59afd02c3f5372e19a536fde339bfd1dc (patch) | |
tree | e75b8c8db82b6cebe7621be854bcf712faab97a7 /fs | |
parent | Wire up finit_module syscall (diff) | |
parent | powerpc: Add missing NULL terminator to avoid boot panic on PPC40x (diff) | |
download | linux-22f4f7b59afd02c3f5372e19a536fde339bfd1dc.tar.xz linux-22f4f7b59afd02c3f5372e19a536fde339bfd1dc.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt:
"Here are a couple of small powerpc fixes. They aren't new bugs (and
they are both CCed to stable) but I didn't see the point of sitting on
the fixes any longer."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Add missing NULL terminator to avoid boot panic on PPC40x
powerpc/vdso: Remove redundant locking in update_vsyscall_tz()
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions