Merge tag 'v3.10.49' into linux-linaro-lsk

This is the 3.10.49 stable release

diff --cc arch/arm64/include/asm/memory.h
Simple merge

diff --cc drivers/cpufreq/Makefile
index 1db9b4929cfa7bafe0040bfebe6812676881f5a5,3b95322fec5e9eaf6dfff7eae72ab3b5c451cfd8..505c62bceb9d190b4715349c0c5038eace378cb3
--- 1/drivers/cpufreq/Makefile
--- 2/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

diff --cc kernel/workqueue.c
Simple merge