Merge branch develop-3.10

diff --cc arch/arm/boot/dts/rk3288.dtsi
Simple merge

diff --cc drivers/clk/rockchip/clk-pll.c
Simple merge

diff --cc drivers/staging/android/ion/rockchip/rockchip_ion.c
Simple merge

diff --cc drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
Simple merge

diff --cc drivers/usb/dwc_otg_310/dwc_otg_driver.c
Simple merge