review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

projects / platform / kernel / linux-amlogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 27365be 02f29ab)

author	Victor Wan <victor.wan@amlogic.com>
	Thu, 31 Aug 2017 06:01:28 +0000 (14:01 +0800)
committer	Victor Wan <victor.wan@amlogic.com>
	Thu, 31 Aug 2017 06:01:28 +0000 (14:01 +0800)
commit	3f653b7e574b1a3899381aa8ae1434521f5e87c3
tree	c3d14ef53795700d1a5e5e6c9fa0aea3811bf6c1	tree \| snapshot
parent	27365be1893079650d9f00cc090d40c1a5092cfa	commit \| diff
parent	02f29ab1b950678e9dcd27ad8f0d8d5c5e90de3d	commit \| diff

Merge branch 'android-4.9' into amlogic-4.9-dev

Conflicts:
arch/arm/configs/s3c2410_defconfig
drivers/mmc/core/mmc.c

Signed-off-by: Victor Wan <victor.wan@amlogic.com>

Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;