Merge tag 'lsk-v3.10-android-14.12'
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 19 Dec 2014 12:02:18 +0000 (20:02 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 19 Dec 2014 12:02:18 +0000 (20:02 +0800)
commit79437e337230dd5c00df8f88e7c883e39aff5dd0
tree87c3ab1f7f7102e3a0a4e846eeb44277e4c750ba
parent561fe83bd43b0ca40a0ea11e8c4d96920e430631
parentf891dfcd5fd0a0848ca42311e78eca8bf1d3e45b
Merge tag 'lsk-v3.10-android-14.12'

LSK Android 14.12 v3.10

Conflicts:
include/linux/clk-provider.h
Makefile
arch/arm/mm/proc-v7.S
arch/arm64/Makefile
drivers/acpi/device_pm.c
drivers/base/power/domain.c
drivers/clk/clk-divider.c
drivers/cpufreq/cpufreq_interactive.c
include/linux/clk-provider.h