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

Conflicts:
	Makefile

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc block/blk-core.c
index 84763c64f88f3b02d98e6099f15f7fa05a66fe8b,35ae52df6b6d851ed0fbd1d84c6d76ec226573c8..44f67b52c399c7b60bdea6f043137829c70e7a71
mode 100755,100644..100755
--- 1/block/blk-core.c
--- 2/block/blk-core.c
+++ b/block/blk-core.c

diff --cc drivers/usb/core/hub.c
index 37a62d644c81f1b114868a32c2a44aa6a9aab1ec,b4688fad950b1a691c1ab3f82cb727d4acd47e5a..89fbd2de29b1c68488cfa2bb6c3dc624c3db38fb
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 01fb3dcde6fd76bded3917a65edb96a6ac517370,c334670d3b0f223f9c96d60d2dd86a151716ff46..a7ce5dab2c8c4301efd02b717b4a7a8c9249aedd
mode 100755,100644..100755
--- 1/drivers/usb/serial/option.c
--- 2/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) },

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/sys.c
Simple merge