Merge tag 'lsk-v3.10-15.10-android'

author Huang, Tao <huangtao@rock-chips.com>

Tue, 27 Oct 2015 06:07:45 +0000 (14:07 +0800)

committer Huang, Tao <huangtao@rock-chips.com>

Tue, 27 Oct 2015 06:07:45 +0000 (14:07 +0800)
author Huang, Tao <huangtao@rock-chips.com>
Tue, 27 Oct 2015 06:07:45 +0000 (14:07 +0800)
committer Huang, Tao <huangtao@rock-chips.com>
Tue, 27 Oct 2015 06:07:45 +0000 (14:07 +0800)
diff --cc Makefile
Simple merge
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc drivers/base/platform.c
Simple merge
diff --cc drivers/hid/usbhid/hid-core.c
Simple merge
author	Huang, Tao <huangtao@rock-chips.com>
	Tue, 27 Oct 2015 06:07:45 +0000 (14:07 +0800)
committer	Huang, Tao <huangtao@rock-chips.com>
	Tue, 27 Oct 2015 06:07:45 +0000 (14:07 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/base/platform.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/usbhid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history