Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop

diff --cc arch/arm/configs/rk2818_info_defconfig
Simple merge

diff --cc arch/arm/mach-rk2818/Kconfig
Simple merge

diff --cc arch/arm/mach-rk2818/board-infosdk.c
Simple merge

diff --cc arch/arm/mach-rk2818/board-midsdk.c
Simple merge

diff --cc arch/arm/mach-rk2818/board-phonesdk.c
Simple merge

diff --cc arch/arm/mach-rk2818/board-raho.c
Simple merge