Merge branch develop-3.10
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 26 Dec 2014 14:26:34 +0000 (22:26 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 26 Dec 2014 14:26:34 +0000 (22:26 +0800)
commit6b278a8e82ff8b751d63b186477b642f27e922db
treea01b2f94136fd8436ce25c93f3e44cf38c960be0
parent37e1b8701091a10db64f0621ad1cf6b70775e4a9
parent4df3c8bb2733b6402d3b529b5f2a4680cbd877fb
Merge branch develop-3.10
arch/arm/boot/dts/rk3288.dtsi
drivers/clk/rockchip/clk-pll.c
drivers/staging/android/ion/rockchip/rockchip_ion.c
drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
drivers/usb/dwc_otg_310/dwc_otg_driver.c