projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21e20e2 73beb63)
Merge tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jan 2014 23:23:57 +0000 (06:23 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jan 2014 23:23:57 +0000 (06:23 +0700)
Pull MFD fix from Samuel Ortiz:
 "This is the 2nd MFD pull request for 3.13

  It only contains one fix for the rtsx_pcr driver.  Without it we see a
  kernel panic on some machines, when resuming from suspend to RAM"

* tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
  mfd: rtsx_pcr: Disable interrupts before cancelling delayed works


Trivial merge
Domain: System / Kernel;