Zhang Bo
c96ae9f146
Merge branch 'android-4.9' into imx_4.9.y
Conflicts:
drivers/cpufreq/cpufreq_interactive.c
drivers/mmc/card/Kconfig
drivers/mmc/card/queue.c
drivers/mmc/card/queue.h
drivers/mmc/core/Kconfig
drivers/mmc/core/block.c
drivers/mmc/core/core.c
drivers/mmc/core/host.c
drivers/mmc/core/mmc.c
drivers/mmc/core/sdio.c
drivers/staging/android/Kconfig
drivers/usb/chipidea/otg.c
include/linux/mmc/core.h
include/linux/mmc/host.h
include/linux/mmc/mmc.h
kernel/sched/cpufreq_schedutil.c
Change-Id: I4dbf6f884a251dffa61ef7271f5c37293b764c94