Merge branch 'clk-fixes' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Tue, 25 Nov 2014 01:45:33 +0000 (17:45 -0800)
committerMichael Turquette <mturquette@linaro.org>
Tue, 25 Nov 2014 01:45:33 +0000 (17:45 -0800)
commitda57b46010dd8d93aabc4c3e8d11751ac617d914
tree1fe26ac6679ea8e76276da87582fcb95210974ed
parent7f615dd43ced8dc5424ad3fa95edd6b7fbbbc27c
parentdcf3d458304aafda3d12413ade39fdf19740dbc3
Merge branch 'clk-fixes' into clk-next
drivers/clk/pxa/clk-pxa27x.c
drivers/clk/rockchip/clk.c