From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 23 Jan 2013 01:49:26 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~7848
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f34f67b5452b400dfdbc75cccfa7a64abf695074;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.60
Conflicts:
	Makefile
---

f34f67b5452b400dfdbc75cccfa7a64abf695074
diff --cc drivers/usb/serial/option.c
index 19de8eff8b1e,9db3e23996f3..c1b057c382fb
mode 100755,100644..100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c