Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge

diff --cc drivers/usb/serial/usb-serial.c
index 6b715c6fb3f17c958f880a16dbb36365f8089a73,49d860078b9367d3f7bda27769cf31d18df93ac1..eb7f76f3327fbfa18a7e3f88b800ff3250e4cb99
--- 1/drivers/usb/serial/usb-serial.c
--- 2/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@@ -1103,13 -1109,13 +1111,19 @@@ int usb_serial_probe(struct usb_interfa
        else                    
                MT6229_USB = 0;
  #endif
+ #ifdef CONFIG_SEW868          
+       if ((le16_to_cpu(dev->descriptor.idVendor) == 0x19d2) && (le16_to_cpu(dev->descriptor.idProduct) == 0xffeb))                    
+               SEW868_USB =1;          
+       else                    
+               SEW868_USB = 0;
+ #endif
  
 +      /* Avoid race with tty_open and serial_install by setting the
 +       * disconnected flag and not clearing it until all ports have been
 +       * registered.
 +       */
 +      serial->disconnected = 1;
 +
        if (get_free_serial(serial, num_ports, &minor) == NULL) {
                dev_err(&interface->dev, "No more free serial devices\n");
                goto probe_error;

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