diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 18:34:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 18:34:56 +0100 |
| commit | 424b6898c8b24f7e89d2c13a141914984ce0f886 (patch) | |
| tree | 93a811a750dd72a3b120dffc13f994edbf8b8da2 /Documentation/lockup-watchdogs.txt | |
| parent | Merge tag 'vfio-v4.11-rc4' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | Merge tag 'sunxi-clk-fixes-for-4.11' of https://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-424b6898c8b24f7e89d2c13a141914984ce0f886.tar.xz linux-424b6898c8b24f7e89d2c13a141914984ce0f886.zip | |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"A handful of Sunxi and Rockchip clk driver fixes and a core framework
one where we need to copy a string because we can't guarantee it isn't
freed sometime later"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: sunxi-ng: fix recalc_rate formula of NKMP clocks
clk: sunxi-ng: Fix div/mult settings for osc12M on A64
clk: rockchip: Make uartpll a child of the gpll on rk3036
clk: rockchip: add "," to mux_pll_src_apll_dpll_gpll_usb480m_p on rk3036
clk: core: Copy connection id
dt-bindings: arm: update Armada CP110 system controller binding
clk: sunxi-ng: sun6i: Fix enable bit offset for hdmi-ddc module clock
clk: sunxi: ccu-sun5i needs nkmp
clk: sunxi-ng: mp: Adjust parent rate for pre-dividers
Diffstat (limited to 'Documentation/lockup-watchdogs.txt')
0 files changed, 0 insertions, 0 deletions