Merge tag 'lsk-v3.10-android-15.01'
authorHuang, Tao <huangtao@rock-chips.com>
Tue, 10 Feb 2015 08:24:25 +0000 (16:24 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 10 Feb 2015 08:24:25 +0000 (16:24 +0800)
commit089c13477b5bed0c83ebb4e7092f254b70df080d
treebd4f86210a00d943b0a6c33c1a9484400f99bd37
parent4b8a18bfbc63bb40cff4c00266dbc07264d070f6
parent429421a879dd2d62ac3573ba23d9faac162f5621
Merge tag 'lsk-v3.10-android-15.01'

LSK Android 15.01 v3.10

Conflicts:
arch/arm/Kconfig.debug
arch/arm64/mm/init.c
drivers/Makefile
drivers/cpufreq/cpufreq_interactive.c
15 files changed:
Makefile
arch/arm/Kconfig.debug
arch/arm/kernel/Makefile
arch/arm/mm/dma-mapping.c
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/kernel/process.c
arch/arm64/mm/init.c
drivers/Makefile
drivers/amba/bus.c
drivers/cpufreq/cpufreq_interactive.c
drivers/mmc/card/block.c
drivers/of/base.c
include/linux/device.h
mm/mmap.c