From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Feb 2014 20:04:06 +0000 (-0800)
Subject: Merge tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd
X-Git-Tag: submit/tizen/20160607.132125~5076
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=981adacd394f15664364d7a9e138efe06c4c07d1;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd

Pull MFD fixes from Lee Jones:
 "Couple of small issues solved:
   - Suspend/Resume call-backs require CONFIG_PM_SLEEP
   - Some drivers written for 32bit architectures fail when compiled
     with a 64bit compiler.  The fixes will future proof the drivers"

* tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd:
  mfd: sec-core: sec_pmic_{suspend,resume}() should depend on CONFIG_PM_SLEEP
  mfd: max14577: max14577_{suspend,resume}() should depend on CONFIG_PM_SLEEP
  mfd: tps65217: Naturalise cross-architecture discrepancies
  mfd: wm8994-core: Naturalise cross-architecture discrepancies
  mfd: max8998: Naturalise cross-architecture discrepancies
  mfd: max8997: Naturalise cross-architecture discrepancies
---

981adacd394f15664364d7a9e138efe06c4c07d1