tree 968c57dd7b9dc33c0a689413e6e392e588d2af78
parent e72643088f576032d0d30c1d62c8fc077f383edc
parent 3c75296562f43e6fbc6cddd3de948a7b3e4e9bcf
author Linus Torvalds <torvalds@linux-foundation.org> 1339178761 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1339178761 -0700

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