projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2467d9 21d6984)
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Sat, 23 Feb 2013 08:41:10 +0000 (16:41 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sat, 23 Feb 2013 08:41:10 +0000 (16:41 +0800)
Merge v3.0.66
Conflicts:
Makefile

1  2 
kernel/printk.c patch | diff1 | diff2 | blob | history

diff --cc kernel/printk.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.