Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/bcm/InterfaceInit.c
index e97ad99b1bb48cdde08f11a861f21d0f409b9d6a,082b5e5c01e8ad16d8aefcaeb3692b3080e2522d..d78d5ef1f298c66a3cd4e580ead618389e094709
--- 1/drivers/staging/bcm/InterfaceInit.c
--- 2/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@@ -239,67 -203,51 +203,51 @@@ usbbcm_device_probe(struct usb_interfac
        psIntfAdapter->interface = intf;
        usb_set_intfdata(intf, psIntfAdapter);
  
-       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);
+       BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+               "psIntfAdapter 0x%p\n", psIntfAdapter);
        retval = InterfaceAdapterInit(psIntfAdapter);
-       if(retval)
-       {
+       if (retval) {
                /* If the Firmware/Cfg File is not present
-                * then return success, let the application
-                * download the files.
-                */
-               if(-ENOENT == retval){
-                       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "File Not Found, Use App to Download\n");
+                * then return success, let the application
+                * download the files.
+                */
+               if (-ENOENT == retval) {
+                       BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "File Not Found.  Use app to download.\n");
                        return STATUS_SUCCESS;
                }
-               BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InterfaceAdapterInit Failed \n");
+               BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                       "InterfaceAdapterInit failed.\n");
                usb_set_intfdata(intf, NULL);
-               udev = interface_to_usbdev (intf);
+               udev = interface_to_usbdev(intf);
                usb_put_dev(udev);
-               if(psAdapter->bUsbClassDriverRegistered == TRUE)
-                               usb_deregister_dev (intf, &usbbcm_class);
                InterfaceAdapterFree(psIntfAdapter);
-               return retval ;
+               return retval;
        }
-       if(psAdapter->chip_id > T3)
-       {
-               uint32_t uiNackZeroLengthInt=4;
-               if(wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt)))
-               {
-                       return -EIO;;
-               }
+       if (psAdapter->chip_id > T3) {
+               uint32_t uiNackZeroLengthInt = 4;
+ 
+               retval = wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt));
+               if (retval)
+                       return retval;
        }
  
-       udev = interface_to_usbdev (intf);
        /* Check whether the USB-Device Supports remote Wake-Up */
-       if(USB_CONFIG_ATT_WAKEUP & udev->actconfig->desc.bmAttributes)
-       {
+       if (USB_CONFIG_ATT_WAKEUP & udev->actconfig->desc.bmAttributes) {
                /* If Suspend then only support dynamic suspend */
-               if(psAdapter->bDoSuspend)
-               {
+               if (psAdapter->bDoSuspend) {
  #ifdef CONFIG_PM
 -                      udev->autosuspend_delay = 0;
 +                      pm_runtime_set_autosuspend_delay(&udev->dev, 0);
                        intf->needs_remote_wakeup = 1;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                       udev->autosuspend_disabled = 0;
- #else
                        usb_enable_autosuspend(udev);
- #endif
-                       device_init_wakeup(&intf->dev,1);
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-                       usb_autopm_disable(intf);
- #endif
+                       device_init_wakeup(&intf->dev, 1);
                        INIT_WORK(&psIntfAdapter->usbSuspendWork, putUsbSuspend);
-                       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Enabling USB Auto-Suspend\n");
+                       BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "Enabling USB Auto-Suspend\n");
  #endif
-               }
-               else
-               {
+               } else {
                        intf->needs_remote_wakeup = 0;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                       udev->autosuspend_disabled = 1;
- #else
                        usb_disable_autosuspend(udev);
- #endif
                }
        }
  

diff --cc drivers/staging/cx25821/cx25821-alsa.c
Simple merge

diff --cc drivers/staging/zram/zram_drv.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc drivers/video/udlfb.c
index 020589a6bf025ab1b979245d03cd766ff775f6f2,8dd21e08a79a6cd99c110da8004ccb7897cf3fdb..2c8364e9b632dafec12912307e55393ba7dc2fcd
--- 1/drivers/video/udlfb.c
--- 2/drivers/staging/udlfb/udlfb.c
+++ b/drivers/video/udlfb.c
@@@ -1128,9 -1163,9 +1128,9 @@@ static int dlfb_realloc_framebuffer(str
                 * But with imperfect damage info we may send pixels over USB
                 * that were, in fact, unchanged - wasting limited USB bandwidth
                 */
-               new_back = vmalloc(new_len);
+               new_back = vzalloc(new_len);
                if (!new_back)
-                       pr_info("No shadow/backing buffer allcoated\n");
 -                      dl_info("No shadow/backing buffer allocated\n");
++                      pr_info("No shadow/backing buffer allocated\n");
                else {
                        if (dev->backing_buffer)
                                vfree(dev->backing_buffer);