commit c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed
author Linus Torvalds <torvalds@linux-foundation.org> Sat Jan 11 06:23:57 2014 +0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Jan 11 06:23:57 2014 +0700
tree 062e2822934edb2157160eeb0cecea568a78b2ab
parent 21e20e22d4e9d6ae8504c7275049a57ad4d1b71f
parent 73beb63d290f961c299526852884846b0d868840

Merge tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes

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