From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jun 2014 19:42:32 +0000 (-0700)
Subject: Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~17775
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bae14e7a2dcb726476b5020396923a24ccc4c40b;p=mirror_ubuntu-kernels.git

Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull more MFD updates from Lee Jones:
 "I missed collecting these patches due to a branch/tag naming
  ambiguity.  Completely my own fault, as I mindlessly named a branch
  and tag identically.  Sorry for the fuss.

  This pull-request contains some misplaced patches from Tony Lindgren
  that should have been part of the initial one"

* tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle
  mfd: twl4030-power: Add support for board specific configuration
  mfd: twl4030-power: Add recommended idle configuration
  mfd: twl4030-power: Add generic reset configuration
  mfd: twl4030-power: Fix some defines for SW_EVENTS
  mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier
---

bae14e7a2dcb726476b5020396923a24ccc4c40b