Merge branch develop-3.10
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 7 Jan 2015 06:30:39 +0000 (14:30 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 7 Jan 2015 06:30:39 +0000 (14:30 +0800)
commit2879802a3cd1713131468610e3756f9cd4e87c51
treee51f2168df0ac6819e7cf0d888ac25956b17c6a7
parent8e593905dca63cb10a78139c7fc8a1314a83ab39
parent49f19c409d16ee6bdd007fa2918c9b79eda7525a
Merge branch develop-3.10
arch/arm/Kconfig
arch/arm/mach-rockchip/Kconfig
arch/arm/mm/proc-v7.S
drivers/usb/dwc_otg_310/dwc_otg_driver.c
drivers/video/rockchip/rk_fb.c
drivers/video/rockchip/transmitter/rk31xx_lvds.c
include/linux/rk_fb.h
kernel/exit.c