projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d55605 e0b8a2e)
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my
authorli bing <libing@rock-chips.com>
Wed, 20 Aug 2014 00:58:40 +0000 (08:58 +0800)
committerli bing <libing@rock-chips.com>
Wed, 20 Aug 2014 00:58:40 +0000 (08:58 +0800)
Conflicts:
arch/arm/boot/dts/rk312x-sdk.dtsi


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