diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 21:42:32 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 21:42:32 +0200 |
commit | bae14e7a2dcb726476b5020396923a24ccc4c40b (patch) | |
tree | 8da2102b927e14b9406db34e41b0ecc192616e2f /Documentation/devicetree/bindings/hid | |
parent | Merge tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc (diff) | |
parent | mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle (diff) | |
download | linux-bae14e7a2dcb726476b5020396923a24ccc4c40b.tar.xz linux-bae14e7a2dcb726476b5020396923a24ccc4c40b.zip |
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
Diffstat (limited to 'Documentation/devicetree/bindings/hid')
0 files changed, 0 insertions, 0 deletions