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)
commita915e30dd26ea5f3cc2e2c044aba38ee5973d3fa
tree0de1e6e8ea64b9a675a135722882cab4768b5002
parentce6dd266d535d66ac90abdd0241e7e5be4890568
parentb0158bb27c7b6e9843f541c17b24dbd964b76db6
Merge branch 'clk-rockchip' into clk-next
drivers/clk/clk.c
drivers/clk/rockchip/clk-rk3036.c
drivers/clk/rockchip/clk-rk3188.c
drivers/clk/rockchip/clk-rk3288.c
drivers/clk/rockchip/clk.c
drivers/clk/rockchip/clk.h
include/linux/clk-provider.h