projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92cac13 d418434)
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Wed, 23 Jan 2013 01:49:26 +0000 (09:49 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 23 Jan 2013 01:49:26 +0000 (09:49 +0800)
Merge v3.0.60
Conflicts:
Makefile

1  2 
drivers/usb/serial/option.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/serial/option.c
index 19de8eff8b1e021716c8d946249a74425825f5cc,9db3e23996f3832643180cd39f9b9bcdab7a8e78..c1b057c382fbd1fd3e8154f7170c90bba9b14e78
mode 100755,100644..100755
--- 1/drivers/usb/serial/option.c
--- 2/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
Unnamed repository; edit this file 'description' to name the repository.