diff options
author | 2018-03-28 17:14:29 +0200 | |
---|---|---|
committer | 2018-03-28 17:14:29 +0200 | |
commit | 84985460569570f5cca5fabbfb811e11b07bc916 (patch) | |
tree | 829a52c7aabf724bf8b481b58749d3ac1438248f /net/unix/af_unix.c | |
parent | Merge tag 'omap-for-v4.17/soc-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
parent | ARM: rockchip: Set name of pmu regmap_config in smp code (diff) | |
download | wireguard-linux-84985460569570f5cca5fabbfb811e11b07bc916.tar.xz wireguard-linux-84985460569570f5cca5fabbfb811e11b07bc916.zip |
Merge tag 'v4.17-rockchip-soc32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "Rockchip soc32 changes for 4.17" from Heiko Stübner:
Fix for the legacy pmu-regmap in the smp-code to have a real name
and therefore not create a dummy* entry in debugfs.
* tag 'v4.17-rockchip-soc32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: Set name of pmu regmap_config in smp code
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions