From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jan 2013 19:37:49 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.8-rc3~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22f4f7b59afd02c3f5372e19a536fde339bfd1dc;p=profile%2Fivi%2Fkernel-x86-ivi.git

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()
---

22f4f7b59afd02c3f5372e19a536fde339bfd1dc