diff options
author | Mike Turquette | 2014-06-11 16:11:59 +0200 |
---|---|---|
committer | Mike Turquette | 2014-06-11 16:11:59 +0200 |
commit | b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508 (patch) | |
tree | 29d2f18d98f7daef1fd8033e95583d83f2096bc2 /drivers/watchdog/Makefile | |
parent | Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-... (diff) | |
parent | clk: sunxi: document PRCM clock compatible strings (diff) | |
download | kernel-qcow2-linux-b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508.tar.gz kernel-qcow2-linux-b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508.tar.xz kernel-qcow2-linux-b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508.zip |
Merge tag 'sunxi-clk-for-3.16-2' of https://github.com/mripard/linux into clk-next
Rebase of Emilio's clk-sunxi-for-3.16 on top of clk-next
Fixed a few compilation warnings exposed by a patch introduced during the 3.16
merge window.
Original tag message:
Allwinner sunXi SoCs clock changes
This pull contains some new code to add support for A31 clocks by Maxime
and Boris. It also reworks the driver a bit to avoid having a huge
single file when we have a full folder for ourselves, and separating
different functional units makes sense.
Diffstat (limited to 'drivers/watchdog/Makefile')
0 files changed, 0 insertions, 0 deletions