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

diff --cc drivers/usb/core/hub.c
index 89fbd2de29b1c68488cfa2bb6c3dc624c3db38fb,be9cac6e3b9e79bee576a33663c4107f616c94bd..e37fdcfeb7e5b62a36ad80dbd22aeaaf7a30e4c5
mode 100755,100644..100755
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c

diff --cc drivers/usb/serial/option.c
index a95a8fe788a5412c1725966f0d3fa4a2f494e7ea,f233bbbfb897adfe09c9792828119bd5d07fd3b5..19de8eff8b1e021716c8d946249a74425825f5cc
mode 100755,100644..100755
--- 1/drivers/usb/serial/option.c
--- 2/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

diff --cc include/linux/netlink.h
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge