From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 18 Feb 2013 04:31:44 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~7611
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=14d96d73a2ec87bd9e4604a4f5f9b1bb14e7387a

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

Merge v3.0.65
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/htc_hst.c
---

14d96d73a2ec87bd9e4604a4f5f9b1bb14e7387a
diff --cc drivers/usb/serial/option.c
index 5e9a16542ec7,52cd814176a7..2317e59046b8
mode 100755,100644..100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -552,12 -539,13 +557,17 @@@ static const struct option_blacklist_in
  	.reserved = BIT(3) | BIT(4),
  };
  
+ static const struct option_blacklist_info telit_le920_blacklist = {
+ 	.sendsetup = BIT(0),
+ 	.reserved = BIT(1) | BIT(5),
+ };
+ 
  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) },
diff --cc net/bluetooth/hci_event.c
index 5a7074a7b5b8,47a3080329b4..0d6f70af1eaa
mode 100755,100644..100755
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c