projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce6dd26 b0158bb)
Merge branch 'clk-rockchip' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Wed, 23 Dec 2015 21:08:56 +0000 (13:08 -0800)
committerMichael Turquette <mturquette@baylibre.com>
Wed, 23 Dec 2015 21:08:56 +0000 (13:08 -0800)
1  2 
drivers/clk/clk.c patch | diff1 | diff2 | blob | history
drivers/clk/rockchip/clk-rk3036.c patch | diff1 | diff2 | blob | history
drivers/clk/rockchip/clk-rk3188.c patch | diff1 | diff2 | blob | history
drivers/clk/rockchip/clk-rk3288.c patch | diff1 | diff2 | blob | history
drivers/clk/rockchip/clk.c patch | diff1 | diff2 | blob | history
drivers/clk/rockchip/clk.h patch | diff1 | diff2 | blob | history
include/linux/clk-provider.h patch | diff1 | diff2 | blob | history

diff --cc drivers/clk/clk.c
Simple merge
diff --cc drivers/clk/rockchip/clk-rk3036.c
Simple merge
diff --cc drivers/clk/rockchip/clk-rk3188.c
Simple merge
diff --cc drivers/clk/rockchip/clk-rk3288.c
Simple merge
diff --cc drivers/clk/rockchip/clk.c
Simple merge
diff --cc drivers/clk/rockchip/clk.h
Simple merge
diff --cc include/linux/clk-provider.h
Simple merge
Linux 6.x block layer and io_uring tree(s)