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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/serial/option.c
index 5e9a16542ec713ddc3fcdacf93471e130300c9eb,52cd814176a7d8c269c630d2208081933c27ebd0..2317e59046b85ea358de813c9ccf641a8fb6bff9
mode 100755,100644..100755
--- 1/drivers/usb/serial/option.c
--- 2/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 5a7074a7b5b89bbc3261ee1478c8afe5adba9052,47a3080329b4bd6267af9acfa55eec83d1fd1f4d..0d6f70af1eaa865c1e86b138c9a32c231d785a0a
mode 100755,100644..100755
--- 1/net/bluetooth/hci_event.c
--- 2/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c

diff --cc net/bluetooth/hidp/core.c
Simple merge

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