diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 11:34:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 11:34:28 -0700 |
| commit | 911f9dab301e8583143c7e75b552eadd434ea0a8 (patch) | |
| tree | 5ae66958da8ad33ac556d2cf59ce915edddec5ad /fs/ocfs2/dlmfs | |
| parent | ae50a840e779d48aa4dea2aaec1778f6b3f1d67f (diff) | |
| parent | 4a5d67d7346619f4a45b5d6f7a496db2e0e8545d (diff) | |
Merge branch 'pcmcia' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM pcmcia updates from Russell King:
"These updates lay the foundations for more generic soc_common PCMCIA
support, which will result in several of the board specific drivers
being elimated.
As the dependencies for this are complex, the preliminary work is
being submitted now, with the remainder scheduled for the next merge
window"
* 'pcmcia' of git://git.armlinux.org.uk/~rmk/linux-arm:
pcmcia: soc_common: add driver-data pointer
pcmcia: soc_common: add support for voltage sense GPIOs
pcmcia: soc_common: constify pcmcia_low_level ops pointer
pcmcia: soc_common: switch to a per-socket cpufreq notifier
pcmcia: soc_common: add support for Vcc and Vpp regulators
pcmcia: soc_common: add CF socket state helper
pcmcia: soc_common: restore previous socket state on error
pcmcia: soc_common: add support for reset and bus enable GPIOs
pcmcia: soc_common: request legacy detect GPIO with active low
pcmcia: soc_common: ignore invalid interrupts
pcmcia: soc_common: switch to using gpio_descs
pcmcia: soc_common: use devm_gpio_request_one()
Diffstat (limited to 'fs/ocfs2/dlmfs')
0 files changed, 0 insertions, 0 deletions