From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 7 Jul 2014 13:01:04 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
X-Git-Tag: firefly_0821_release~4916^2~287^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=223378cc0f7c4f848fcbc9af4b4b530935cb159b;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	drivers/mmc/host/Kconfig
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h
	include/linux/mmc/rk_mmc.h
	include/linux/rockchip/cru.h
---

223378cc0f7c4f848fcbc9af4b4b530935cb159b
diff --cc drivers/clk/rockchip/clk-pll.c
index d1dcfa2e3ed5,e4a0b4866cf9..dee39a0edebe
mode 100755,100644..100755
--- a/drivers/clk/rockchip/clk-pll.c
+++ b/drivers/clk/rockchip/clk-pll.c