diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-15 13:40:31 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-15 13:40:31 -0700 |
| commit | f6b3f4ac521523432761f4480dd3cad1a955593b (patch) | |
| tree | 0260b06b33f196381495150b2a3a7ca0ef29b7e2 /crypto/crypto_wq.c | |
| parent | 3ea8f233cfe546d060360ce0d01844f60744fb21 (diff) | |
| parent | 0afd32c6bb59e41b6692dec4473efaffffcad67b (diff) | |
Merge tag 'v4.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into next/drivers
- use timeout helpers for scpsys and infracfg drivers
- use of_device_get_match_data in pmic wrapper and scpsys
* tag 'v4.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
soc: mediatek: remove unneeded semicolon
soc: mediatek: add a fixed wait for SRAM stable
soc: mediatek: introduce a CAPS flag for scp_domain_data
soc: mediatek: reuse regmap_read_poll_timeout helpers
regmap: include <linux/ktime.h> from include/linux/regmap.h
soc: mediatek: reuse read[l,x]_poll_timeout helpers
soc: mediatek: use of_device_get_match_data()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'crypto/crypto_wq.c')
0 files changed, 0 insertions, 0 deletions