Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jan 2013 19:37:49 +0000 (11:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jan 2013 19:37:49 +0000 (11:37 -0800)
commit22f4f7b59afd02c3f5372e19a536fde339bfd1dc
treee75b8c8db82b6cebe7621be854bcf712faab97a7
parent062fe95afe93a24b33d34491c54445ab5438d0ba
parente6449c9b2d90c1bd9a5985bf05ddebfd1631cd6b
Merge branch 'merge' of git://git./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()