From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jan 2014 23:23:57 +0000 (+0700)
Subject: Merge tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: v3.13-rc8~8
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed

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
---

c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed