Merge branch develop-3.10 into develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 12 Dec 2014 06:12:56 +0000 (14:12 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 12 Dec 2014 06:12:56 +0000 (14:12 +0800)
commit801c2bd37821e66de100e8f4a0729d9242fb34c7
tree01206f0d17e0daa7fca64190838b1e10bb9becec
parent4abd927beb7f9692be9076b92024d14d1a8eb97d
parent037ab540844db81ac19f714d48504cd3bb0bd055
Merge branch develop-3.10 into develop-3.10-next
arch/arm/mach-rockchip/common.c
drivers/clk/rockchip/clk-pll.c