diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-02-16 03:13:58 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-02-16 03:14:31 +0300 |
commit | a9ca321716c801ae4e731b3a016c24633374b59b (patch) | |
tree | 23918bcec4d035cc0755f4de6049d8cb3a421428 /net/ipv6/icmp.c | |
parent | d8c22b32a612fb7940e9d1c0068fb80fcbfe8da7 (diff) | |
parent | c5f09e6bd8a7537beef8ee53cd161a06b04de271 (diff) | |
download | linux-a9ca321716c801ae4e731b3a016c24633374b59b.tar.xz |
Merge tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson into clk-meson
Pull another set of Amlogic clk drivers updates from Neil Armstrong:
- Add G12A Always-On Clock Controller
- Fix Meson8 APB clock ID name
* tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson:
clk: meson: meson8b: fix the naming of the APB clocks
dt-bindings: clock: meson8b: add APB clock definition
clk: meson: Add G12A AO Clock + Reset Controller
dt-bindings: clk: add G12A AO Clock and Reset Bindings
Diffstat (limited to 'net/ipv6/icmp.c')
0 files changed, 0 insertions, 0 deletions