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

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

author	黄涛 <huangtao@rock-chips.com>
	Mon, 7 Jul 2014 13:01:04 +0000 (21:01 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Mon, 7 Jul 2014 13:01:04 +0000 (21:01 +0800)
commit	223378cc0f7c4f848fcbc9af4b4b530935cb159b
tree	5556aef3fb93fb67435fe53bd5dc9d9aa7384657	tree \| snapshot
parent	1e78f18756f580632c124891da73106bb22ddb0a	commit \| diff
parent	b83cf632f3f4084f594b1a6a467c854c156cf672	commit \| diff

Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
drivers/mmc/host/Kconfig
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h
include/linux/mmc/rk_mmc.h
include/linux/rockchip/cru.h

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

RSS Atom

arch/arm/configs/rockchip_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/clk/rockchip/clk-pll.c	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/rk_fb.c	diff1 \|	diff2 \|	blob \| history
include/dt-bindings/clock/rockchip.h	diff1 \|	diff2 \|	blob \| history
include/linux/rockchip/cru.h	diff1 \|	diff2 \|	blob \| history