Merge branch develop-3.10

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

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

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

diff --cc drivers/usb/dwc_otg_310/usbdev_rk.h
Simple merge

diff --cc drivers/usb/host/ehci-rockchip.c
Simple merge

diff --cc drivers/video/rockchip/rk_fb.c
Simple merge

diff --cc drivers/video/rockchip/rkfb_sysfs.c
index 6a9f6037f2a2a988d1ffff443a3e507cea2b7c68,ffbc0fc3df1cce9eb4ce96cb86fd58fb1a70d2e0..6a9f6037f2a2a988d1ffff443a3e507cea2b7c68
mode 100755,100644..100644
--- 1/drivers/video/rockchip/rkfb_sysfs.c
--- 2/drivers/video/rockchip/rkfb_sysfs.c
+++ b/drivers/video/rockchip/rkfb_sysfs.c

diff --cc net/rfkill/rfkill-wlan.c
Simple merge