projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 520cc15 f2fa414)
Merge remote-tracking branch 'remotes/kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Mon, 1 Aug 2011 04:16:19 +0000 (12:16 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 1 Aug 2011 04:16:19 +0000 (12:16 +0800)
1  2 
arch/arm/mach-rk29/vpu_service.c patch | diff1 | diff2 | blob | history

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