projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e726430 3c75296)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jun 2012 18:06:01 +0000 (11:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jun 2012 18:06:01 +0000 (11:06 -0700)
commit3e9ca0224152bac6ea812e3ccfe933d3932c21bd
tree968c57dd7b9dc33c0a689413e6e392e588d2af78tree | snapshot
parente72643088f576032d0d30c1d62c8fc077f383edccommit | diff
parent3c75296562f43e6fbc6cddd3de948a7b3e4e9bcfcommit | diff
Merge branch 'merge' of git://git./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
Domain: System / Kernel;