projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9505d02 376faec)
Merge remote branch 'linux-2.6.32.y/master' into develop
author黄涛 <huangtao@rock-chips.com>
Sun, 13 Feb 2011 02:25:30 +0000 (10:25 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 13 Feb 2011 02:25:30 +0000 (10:25 +0800)
Conflicts:
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/p54/p54usb.c

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.