Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e7cee74 5c4f909)

author	Huang, Tao <huangtao@rock-chips.com>
	Thu, 5 Mar 2015 09:11:40 +0000 (17:11 +0800)
committer	Huang, Tao <huangtao@rock-chips.com>
	Thu, 5 Mar 2015 09:11:40 +0000 (17:11 +0800)
commit	1ca180425cb8d57166bdcbc7ae4fbceaeae0f1fd
tree	fa060b14b891e45baac18ed15fd98f5910b9e247	tree \| snapshot
parent	e7cee74f7ceddb4bd64bf710599ab6b997016a65	commit \| diff
parent	5c4f9098b76b4d3aa797513db19bb11696942953	commit \| diff

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

LSK Android 15.02 v3.10

Conflicts:
drivers/Kconfig
drivers/regulator/core.c
include/linux/of.h

18 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/base/platform.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	diff1 \|	diff2 \|	blob \| history
drivers/of/fdt.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/core.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion_heap.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion_system_heap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/android.c	diff1 \|	diff2 \|	blob \| history
include/linux/of.h	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.