| commit | 84985460569570f5cca5fabbfb811e11b07bc916 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Mar 28 17:14:29 2018 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Mar 28 17:14:29 2018 +0200 |
| tree | 829a52c7aabf724bf8b481b58749d3ac1438248f | |
| parent | 064fe81ef23d72854e7f17fd58a945e4fd0d0f3f [diff] | |
| parent | 03151b8989257bfcee6cfd5f06d9a4a06b781cf3 [diff] |
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