From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 27 Dec 2012 04:57:21 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~8057
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1bdf414f0e84042659c6d6739f58536d3162ade4;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	Makefile
---

1bdf414f0e84042659c6d6739f58536d3162ade4
diff --cc drivers/usb/serial/option.c
index e43db6a0192c,872807ba38c5..a95a8fe788a5
mode 100755,100644..100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c