Merge branch develop-3.10
authorHuang, Tao <huangtao@rock-chips.com>
Tue, 17 Mar 2015 07:16:39 +0000 (15:16 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 17 Mar 2015 07:16:39 +0000 (15:16 +0800)
commit05b29f94a4ab4f37071025b0c235516c2616bce6
tree46c4b4ba8fffa0837b2cf27d71c21ed0c9efc207
parentb7574401ec571097859d39b9b1bc9f369609f955
parent3292ba3d84aa359f889326aedc777c865261f0c0
Merge branch develop-3.10
arch/arm/boot/dts/rk312x.dtsi
drivers/usb/dwc_otg_310/dwc_otg_driver.c
drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c
drivers/usb/dwc_otg_310/usbdev_rk.h
drivers/usb/host/ehci-rockchip.c
drivers/video/rockchip/rk_fb.c
drivers/video/rockchip/rkfb_sysfs.c
net/rfkill/rfkill-wlan.c