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

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

Merge v3.0.59
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
	drivers/usb/serial/option.c
---

67450b3bb618e8f63e963f2182df33a19f863486
diff --cc drivers/usb/core/hub.c
index 89fbd2de29b1,be9cac6e3b9e..e37fdcfeb7e5
mode 100755,100644..100755
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
diff --cc drivers/usb/serial/option.c
index a95a8fe788a5,f233bbbfb897..19de8eff8b1e
mode 100755,100644..100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -364,13 -359,6 +365,17 @@@ static void option_instat_callback(stru
  #define SAMSUNG_VENDOR_ID                       0x04e8
  #define SAMSUNG_PRODUCT_GT_B3730                0x6889
  
 +/* leadcore LC1808*/
 +#define LEADCORE_VENDOR_ID	0x1ab7
 +#define LEADCORE_PRODUCT_LC1808	0x2200
 +/*展讯模组*/
 +#define SC8800G_VENDOR_ID	0x067b
 +#define SC8800G_PRODUCT_ID	0x2303
 +
++/*usi mt6229 modem*/
++#define MT6229_VENDOR_ID			0x0e8d
++#define MT6229_PRODUCT_ID			0x00a0
++
  /* YUGA products  www.yuga-info.com gavin.kx@qq.com */
  #define YUGA_VENDOR_ID				0x257A
  #define YUGA_PRODUCT_CEM600			0x1601