From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jun 2012 18:06:01 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v3.5-rc2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3e9ca0224152bac6ea812e3ccfe933d3932c21bd;p=users%2Fwilly%2Flinux.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Pull powerpc fixes from Paul Mackerras:
 "Two small fixes for powerpc:
   - a fix for a regression since 3.2 that causes 4-second (or longer)
     pauses
   - a fix for a potential oops when loading kernel modules on 32-bit
     embedded systems."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix kernel panic during kernel module load
  powerpc/time: Sanity check of decrementer expiration is necessary
---

3e9ca0224152bac6ea812e3ccfe933d3932c21bd