Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
author黄涛 <huangtao@rock-chips.com>
Fri, 8 Aug 2014 02:21:50 +0000 (10:21 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 8 Aug 2014 02:21:50 +0000 (10:21 +0800)
commitc7412991e9eef6430e1d7030144557a3c56309e4
tree5364f57a26594f7b261a71990fa6bc7923acca76
parentdd52ff55d3c0381dca70658d3cc73225f338740c
parent9dbc54318147064394cf3da66edf700abeb0c4ea
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
arch/arm/mach-rockchip/vcodec_service.c
drivers/input/Makefile
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Makefile
drivers/input/Kconfig
drivers/input/Makefile
drivers/video/rockchip/rk_fb.c