projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8315cce
425f051
)
Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into...
author
黄涛
<huangtao@rock-chips.com>
Tue, 17 Dec 2013 06:41:09 +0000
(14:41 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Tue, 17 Dec 2013 06:41:09 +0000
(14:41 +0800)
Conflicts:
kernel/printk.c
Trivial merge