David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
clk-cpu.c	clk: rockchip: fix deadlock possibility in cpuclk	2015-01-17 11:22:39 -08:00
clk-mmc-phase.c	clk: rockchip: Add support for the mmc clock phases using the framework	2014-11-28 00:44:24 +01:00
clk-pll.c	clk: rockchip: add optional sync to pll rate parameters	2014-11-25 09:57:18 +01:00
clk-rk3188.c	clk: rockchip: fix rk3066 pll lock bit location	2014-12-28 23:30:08 +01:00
clk-rk3288.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
clk-rockchip.c	clk: rockchip: fix function type for CLK_OF_DECLARE	2014-05-20 14:25:22 -05:00
clk.c	- clock phase setting capability for the rk3288 mmc clocks	2014-11-28 21:00:16 -08:00
clk.h	clk: rockchip: Add support for the mmc clock phases using the framework	2014-11-28 00:44:24 +01:00
Makefile	clk: rockchip: Add support for the mmc clock phases using the framework	2014-11-28 00:44:24 +01:00
softrst.c	clk: rockchip: add reset controller	2014-07-13 12:17:07 -07:00