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

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

Conflicts:
	Makefile
---

903d694ab5878781502eb798012604aaac27c466
diff --cc block/blk-core.c
index 84763c64f88f,35ae52df6b6d..44f67b52c399
mode 100755,100644..100755
--- a/block/blk-core.c
+++ b/block/blk-core.c
diff --cc drivers/usb/core/hub.c
index 37a62d644c81,b4688fad950b..89fbd2de29b1
mode 100755,100644..100755
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
diff --cc drivers/usb/serial/option.c
index 01fb3dcde6fd,c334670d3b0f..a7ce5dab2c8c
mode 100755,100644..100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -526,12 -512,12 +530,16 @@@ static const struct option_blacklist_in
  	.reserved = BIT(4),
  };
  
+ static const struct option_blacklist_info zte_1255_blacklist = {
+ 	.reserved = BIT(3) | BIT(4),
+ };
+ 
  static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 +	{ USB_DEVICE(THINKWILL_VENDOR_ID,THINKWILL_PRODUCT_ID)},
 +
 +	{ USB_DEVICE(THINKWILL_VENDOR_ID,THINKWILL_MI900_PRODUCT_ID)},
 +
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },