From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 8 Aug 2014 02:21:50 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
X-Git-Tag: firefly_0821_release~4916^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7412991e9eef6430e1d7030144557a3c56309e4;p=firefly-linux-kernel-4.4.55.git

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

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

c7412991e9eef6430e1d7030144557a3c56309e4
diff --cc drivers/input/Kconfig
index dfcb7942964a,846490903c01..6deb45a71461
mode 100755,100644..100755
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
diff --cc drivers/input/Makefile
index 20ff7f8c228a,d84c599c7bce..842f73062f3f
mode 100755,100644..100755
--- a/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
+