diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 16:48:52 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 16:48:52 +0300 |
| commit | 064fe81ef23d72854e7f17fd58a945e4fd0d0f3f (patch) | |
| tree | 9ecd5fcaa873278b9c51b286e21fe0bb53d86d75 /net/tipc/net.c | |
| parent | 930284942694bcb10a41c017d87e04aafbe2626e (diff) | |
| parent | 5aa6d80624d54d8aefaed8a4798b7aaa56290ccc (diff) | |
| download | linux-064fe81ef23d72854e7f17fd58a945e4fd0d0f3f.tar.xz | |
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
Pull "Two omap5 specific aux control module patches for v4.17" from Tony Lindgren:
On omap5 there is an aux control module that we are not handling
currently for clocks, so let's add support for it.
* tag 'omap-for-v4.17/soc-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP5: control: add support for control module wkup pad config
ARM: omap2+: control: add support for auxiliary control module instances
Diffstat (limited to 'net/tipc/net.c')
0 files changed, 0 insertions, 0 deletions