Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/input/Makefile

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/cpufreq/Makefile
Simple merge

diff --cc drivers/input/Kconfig
index dfcb7942964aeab54ad7b4edb8e0eabe876d2c92,846490903c01d6ce69bd2b5a1184584e8c96b58f..6deb45a71461357a711828ec53a0833c891741e5
mode 100755,100644..100755
--- 1/drivers/input/Kconfig
--- 2/drivers/input/Kconfig
+++ b/drivers/input/Kconfig

diff --cc drivers/input/Makefile
index 20ff7f8c228a6a3403655f25ffac4f8a43c35d8e,d84c599c7bce180a8075f39589de744563173e3c..842f73062f3f869ed1eb18ca03026489252cc18e
mode 100755,100644..100755
--- 1/drivers/input/Makefile
--- 2/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@@ -26,4 -26,5 +26,6 @@@ obj-$(CONFIG_INPUT_MISC)      += misc
  obj-$(CONFIG_SENSOR_DEVICE) += sensors/
  obj-$(CONFIG_INPUT_APMPOWER)  += apm-power.o
  obj-$(CONFIG_INPUT_KEYRESET)  += keyreset.o
- obj-$(CONFIG_ROCKCHIP_REMOTECTL)        += remotectl/
++obj-$(CONFIG_ROCKCHIP_REMOTECTL)+= remotectl/
+ obj-$(CONFIG_INPUT_KEYCOMBO)  += keycombo.o
+ 

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