projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 897f46a 0b821e0)
Merge remote-tracking branch 'remotes/origin/develop-3.0' into develop-3.0-rk2928
author黄涛 <huangtao@rock-chips.com>
Tue, 10 Jul 2012 05:11:01 +0000 (13:11 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 10 Jul 2012 05:11:01 +0000 (13:11 +0800)
Conflicts:
arch/arm/plat-rk/Makefile

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.