merge fixups due to sparse cleanups being done by al and greg at the same time.

diff --cc CREDITS
Simple merge

diff --cc drivers/usb/gadget/ether.c
index 1b7be60bdc2ec8bc18a58352e2619b1b12e9f45a,b8dcd6c1c1f970930ed25b937ced4914f87f127c..174afd47b75907eafd9731cac95b8e970a2290b2
--- 1/drivers/usb/gadget/ether.c
--- 2/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@@ -692,12 -704,12 +704,12 @@@ static const struct usb_descriptor_head
  static inline void __init fs_subset_descriptors(void)
  {
  #ifdef DEV_CONFIG_SUBSET
-       fs_eth_function[0] = (struct usb_descriptor_header *) &subset_data_intf;
-       fs_eth_function[1] = (struct usb_descriptor_header *) &fs_source_desc;
-       fs_eth_function[2] = (struct usb_descriptor_header *) &fs_sink_desc;
-       fs_eth_function[3] = NULL;
+       fs_eth_function[1] = (struct usb_descriptor_header *) &subset_data_intf;
+       fs_eth_function[2] = (struct usb_descriptor_header *) &fs_source_desc;
+       fs_eth_function[3] = (struct usb_descriptor_header *) &fs_sink_desc;
 -      fs_eth_function[4] = 0;
++      fs_eth_function[4] = NULL;
  #else
-       fs_eth_function[0] = NULL;
 -      fs_eth_function[1] = 0;
++      fs_eth_function[1] = NULL;
  #endif
  }
  
@@@ -787,12 -801,12 +801,12 @@@ static const struct usb_descriptor_head
  static inline void __init hs_subset_descriptors(void)
  {
  #ifdef DEV_CONFIG_SUBSET
-       hs_eth_function[0] = (struct usb_descriptor_header *) &subset_data_intf;
-       hs_eth_function[1] = (struct usb_descriptor_header *) &fs_source_desc;
-       hs_eth_function[2] = (struct usb_descriptor_header *) &fs_sink_desc;
-       hs_eth_function[3] = NULL;
+       hs_eth_function[1] = (struct usb_descriptor_header *) &subset_data_intf;
+       hs_eth_function[2] = (struct usb_descriptor_header *) &fs_source_desc;
+       hs_eth_function[3] = (struct usb_descriptor_header *) &fs_sink_desc;
 -      hs_eth_function[4] = 0;
++      hs_eth_function[4] = NULL;
  #else
-       hs_eth_function[0] = NULL;
 -      hs_eth_function[1] = 0;
++      hs_eth_function[1] = NULL;
  #endif
  }
  

diff --cc drivers/usb/gadget/inode.c
Simple merge

diff --cc drivers/usb/gadget/zero.c
index 28ba82234ed8f45a22b1586b488008bde1f1439e,0251f0641e5fa47265c563c63da9521afee2d80f..4fa5e1c8f2412aaa8b97155d283aa837e14fe7ea
--- 1/drivers/usb/gadget/zero.c
--- 2/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@@ -808,9 -829,10 +829,10 @@@ static void zero_reset_config (struct z
        }
        if (dev->out_ep) {
                usb_ep_disable (dev->out_ep);
 -              dev->out_ep = 0;
 +              dev->out_ep = NULL;
        }
        dev->config = 0;
+       del_timer (&dev->resume);
  }
  
  /* change our operational config.  this code must agree with the code

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/usb/image/mdc800.c
index d5c3d41cefafe900a602dc3e4280a01a987cabb4,a140f1a50ec34275091c59632dd4951755f2886d..f401557f035693bbe4292440822a55affdf9b35c
--- 1/drivers/usb/image/mdc800.c
--- 2/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@@ -971,9 -971,7 +971,7 @@@ static struct usb_driver mdc800_usb_dri
        Init and Cleanup this driver (Main Functions)
  *************************************************************************/
  
 -#define try(A)           if ((A) == 0) goto cleanup_on_fail;
 +#define try(A)           if (!(A)) goto cleanup_on_fail;
- #define try_free_mem(A)  if (A) { kfree (A); A=NULL; }
- #define try_free_urb(A)  if (A) { usb_free_urb (A); A=NULL; }
  
  static int __init usb_mdc800_init (void)
  {

diff --cc drivers/usb/misc/auerswald.c
index 0fb153a2daa5ec4abde579998316e583447db36c,7ae8401239c0746e07a87e15efe4aeb3a5aa698a..3a61a0b77f8768d05aaf04ab3dfbde62948a537d
--- 1/drivers/usb/misc/auerswald.c
--- 2/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@@ -2,7 -2,7 +2,7 @@@
  /*
   *      auerswald.c  --  Auerswald PBX/System Telephone usb driver.
   *
-- *      Copyright (C) 2001  Wolfgang Mües (wolfgang@iksw-muees.de)
++ *      Copyright (C) 2001  Wolfgang Mües (wolfgang@iksw-muees.de)
   *
   *      Very much code of this driver is borrowed from dabusb.c (Deti Fliegl)
   *      and from the USB Skeleton driver (Greg Kroah-Hartman). Thank you.
@@@ -50,7 -50,7 +50,7 @@@ do {                  
  /*-------------------------------------------------------------------*/
  /* Version Information */
  #define DRIVER_VERSION "0.9.11"
--#define DRIVER_AUTHOR  "Wolfgang Mües <wolfgang@iksw-muees.de>"
++#define DRIVER_AUTHOR  "Wolfgang Mües <wolfgang@iksw-muees.de>"
  #define DRIVER_DESC    "Auerswald PBX/System Telephone usb driver"
  
  /*-------------------------------------------------------------------*/

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

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

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