diff options
author | Olof Johansson <olof@lixom.net> | 2016-02-24 13:51:45 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-02-24 13:51:45 -0800 |
commit | 4375acc3e2ebdc8158fb2745dc143736a9bd6769 (patch) | |
tree | 05ce74e92265f3198ec8da21758c4086b283bf6f /crypto/sha512_generic.c | |
parent | efa9b9e39eb1de5a5f0833c234ac1677572fca55 (diff) | |
parent | e6f49b118f73a769ec51ed28a085e9dccd67f9a1 (diff) |
Merge tag 'v4.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64
Define the tuning-related mmc clocks and move from
gpio-key,wakeup to the more generic wakeup-source property.
* tag 'v4.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: replace gpio-key,wakeup with wakeup-source property
arm64: dts: rockchip: add rk3368 tuning clk for emmc and sdmmc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'crypto/sha512_generic.c')
0 files changed, 0 insertions, 0 deletions