diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-22 11:52:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-22 11:52:49 -0700 |
| commit | 09502d9fffd84d22dd1fba9fd4cf0d880a5da377 (patch) | |
| tree | bbec3a03be7d53222cf085535657360fa595e472 /lib/genalloc.c | |
| parent | ddce192106e4f984123884f8e878f66ace94b573 (diff) | |
| parent | 56b367c0cd67d4c3006738e7dc9dda9273fd2bfe (diff) | |
| download | op-kernel-dev-09502d9fffd84d22dd1fba9fd4cf0d880a5da377.zip op-kernel-dev-09502d9fffd84d22dd1fba9fd4cf0d880a5da377.tar.gz | |
Merge tag 'pinctrl-v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
"Some pin control driver fixes came in. One headed for stable and the
other two are just ordinary merge window fixes.
- Make the i.MX driver select REGMAP as a dependency
- Fix up the Mediatek debounce time unit
- Fix a real hairy ffs vs __ffs issue in the Single pinctrl driver"
* tag 'pinctrl-v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: single: Fix pcs_parse_bits_in_pinctrl_entry to use __ffs than ffs
pinctrl: mediatek: correct debounce time unit in mtk_gpio_set_debounce
pinctrl: imx: Kconfig: PINCTRL_IMX select REGMAP
Diffstat (limited to 'lib/genalloc.c')
0 files changed, 0 insertions, 0 deletions
