diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-26 00:15:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-26 00:15:54 +0200 |
| commit | a8b253b9f253c05e5e10b829b8d1fb24556f4b56 (patch) | |
| tree | 7ea8fcd19fadfcf71ef235bb35f76f99bc51d664 /arch/alpha/kernel/sys_marvel.c | |
| parent | Merge tag 'gpio-v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linu... (diff) | |
| parent | pinctrl: Fix gpio/pin mapping for Meson8b (diff) | |
| download | linux-a8b253b9f253c05e5e10b829b8d1fb24556f4b56.tar.xz linux-a8b253b9f253c05e5e10b829b8d1fb24556f4b56.zip | |
Merge tag 'pinctrl-v4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
"Here are some three pin control fixes for the v4.1 cycle, all
driver-specific. Business as usual and calm as it should be in this
portion of the merge window.
- IRQ trigger fix for the Intel Cherryview
- GPIO-to-pin mapping fix for the Cygnus driver
- GPIO-to-pin mapping fix for the Meson8b driver"
* tag 'pinctrl-v4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: Fix gpio/pin mapping for Meson8b
pinctrl: cygnus: fixed incorrect GPIO-pin mapping
pinctrl: cherryview: Read triggering type from HW if not set when requested
Diffstat (limited to 'arch/alpha/kernel/sys_marvel.c')
0 files changed, 0 insertions, 0 deletions