Merge tag 'lsk-v3.10-15.04-android'
authorHuang, Tao <huangtao@rock-chips.com>
Tue, 5 May 2015 02:51:31 +0000 (10:51 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 5 May 2015 02:51:31 +0000 (10:51 +0800)
commitf07d7eb59119a4e72372fa60a2198f20f5302f95
treed90135f99aee89850b66eb3b581b3db9b260d15c
parentd323420ea062e2dd35e5a3106dab4941dc10d14e
parent14cdcbf57afac55489130a55ea0e8a59481531d8
Merge tag 'lsk-v3.10-15.04-android'

Conflicts:
drivers/base/cpu.c
drivers/misc/Kconfig
drivers/misc/Makefile
Makefile
arch/arm64/kernel/setup.c
arch/arm64/mm/init.c
drivers/base/cpu.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/regulator/core.c
drivers/usb/gadget/android.c