From: Alex Shi Date: Fri, 18 Jul 2014 06:06:21 +0000 (+0800) Subject: Merge tag 'v3.10.49' into linux-linaro-lsk X-Git-Tag: firefly_0821_release~3680^2~36^2~45 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0bc082b9c9d792a65e062856eb559b534d81fd8;p=firefly-linux-kernel-4.4.55.git Merge tag 'v3.10.49' into linux-linaro-lsk This is the 3.10.49 stable release --- d0bc082b9c9d792a65e062856eb559b534d81fd8 diff --cc drivers/cpufreq/Makefile index 1db9b4929cfa,3b95322fec5e..505c62bceb9d --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@@ -48,10 -48,9 +48,10 @@@ obj-$(CONFIG_X86_AMD_FREQ_SENSITIVITY) obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ) += arm_big_little.o # big LITTLE per platform glues. Keep DT_BL_CPUFREQ as the last entry in all big # LITTLE drivers, so that it is probed last. +obj-$(CONFIG_ARM_VEXPRESS_BL_CPUFREQ) += vexpress_big_little.o obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o - obj-$(CONFIG_ARCH_DAVINCI_DA850) += davinci-cpufreq.o + obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o