Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Trivial manual merge fixup for usb_find_interface clashes.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/scsi/ipr.c
Simple merge

diff --cc drivers/usb/core/usb.c
index 56a3520863a969f366a1be30ea7c0618317de4a4,af2f0941baac1918c7727930e9af62d1b2122482..13d1d367f7f1ed6e80a386a69bf1fed4d5f4d3de
--- 1/drivers/usb/core/usb.c
--- 2/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@@ -192,10 -351,137 +192,11 @@@ void usb_driver_release_interface(struc
        iface->condition = USB_INTERFACE_UNBOUND;
        mark_quiesced(iface);
  }
 -/**
 - * usb_match_id - find first usb_device_id matching device or interface
 - * @interface: the interface of interest
 - * @id: array of usb_device_id structures, terminated by zero entry
 - *
 - * usb_match_id searches an array of usb_device_id's and returns
 - * the first one matching the device or interface, or null.
 - * This is used when binding (or rebinding) a driver to an interface.
 - * Most USB device drivers will use this indirectly, through the usb core,
 - * but some layered driver frameworks use it directly.
 - * These device tables are exported with MODULE_DEVICE_TABLE, through
 - * modutils, to support the driver loading functionality of USB hotplugging.
 - *
 - * What Matches:
 - *
 - * The "match_flags" element in a usb_device_id controls which
 - * members are used.  If the corresponding bit is set, the
 - * value in the device_id must match its corresponding member
 - * in the device or interface descriptor, or else the device_id
 - * does not match.
 - *
 - * "driver_info" is normally used only by device drivers,
 - * but you can create a wildcard "matches anything" usb_device_id
 - * as a driver's "modules.usbmap" entry if you provide an id with
 - * only a nonzero "driver_info" field.  If you do this, the USB device
 - * driver's probe() routine should use additional intelligence to
 - * decide whether to bind to the specified interface.
 - * 
 - * What Makes Good usb_device_id Tables:
 - *
 - * The match algorithm is very simple, so that intelligence in
 - * driver selection must come from smart driver id records.
 - * Unless you have good reasons to use another selection policy,
 - * provide match elements only in related groups, and order match
 - * specifiers from specific to general.  Use the macros provided
 - * for that purpose if you can.
 - *
 - * The most specific match specifiers use device descriptor
 - * data.  These are commonly used with product-specific matches;
 - * the USB_DEVICE macro lets you provide vendor and product IDs,
 - * and you can also match against ranges of product revisions.
 - * These are widely used for devices with application or vendor
 - * specific bDeviceClass values.
 - *
 - * Matches based on device class/subclass/protocol specifications
 - * are slightly more general; use the USB_DEVICE_INFO macro, or
 - * its siblings.  These are used with single-function devices
 - * where bDeviceClass doesn't specify that each interface has
 - * its own class. 
 - *
 - * Matches based on interface class/subclass/protocol are the
 - * most general; they let drivers bind to any interface on a
 - * multiple-function device.  Use the USB_INTERFACE_INFO
 - * macro, or its siblings, to match class-per-interface style 
 - * devices (as recorded in bDeviceClass).
 - *  
 - * Within those groups, remember that not all combinations are
 - * meaningful.  For example, don't give a product version range
 - * without vendor and product IDs; or specify a protocol without
 - * its associated class and subclass.
 - */   
 -const struct usb_device_id *
 -usb_match_id(struct usb_interface *interface, const struct usb_device_id *id)
 -{
 -      struct usb_host_interface *intf;
 -      struct usb_device *dev;
 -
 -      /* proc_connectinfo in devio.c may call us with id == NULL. */
 -      if (id == NULL)
 -              return NULL;
 -
 -      intf = interface->cur_altsetting;
 -      dev = interface_to_usbdev(interface);
 -
 -      /* It is important to check that id->driver_info is nonzero,
 -         since an entry that is all zeroes except for a nonzero
 -         id->driver_info is the way to create an entry that
 -         indicates that the driver want to examine every
 -         device and interface. */
 -      for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass ||
 -             id->driver_info; id++) {
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) &&
 -                  id->idVendor != le16_to_cpu(dev->descriptor.idVendor))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_PRODUCT) &&
 -                  id->idProduct != le16_to_cpu(dev->descriptor.idProduct))
 -                      continue;
 -
 -              /* No need to test id->bcdDevice_lo != 0, since 0 is never
 -                 greater than any unsigned number. */
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_LO) &&
 -                  (id->bcdDevice_lo > le16_to_cpu(dev->descriptor.bcdDevice)))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_HI) &&
 -                  (id->bcdDevice_hi < le16_to_cpu(dev->descriptor.bcdDevice)))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_CLASS) &&
 -                  (id->bDeviceClass != dev->descriptor.bDeviceClass))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_SUBCLASS) &&
 -                  (id->bDeviceSubClass!= dev->descriptor.bDeviceSubClass))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_PROTOCOL) &&
 -                  (id->bDeviceProtocol != dev->descriptor.bDeviceProtocol))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_INT_CLASS) &&
 -                  (id->bInterfaceClass != intf->desc.bInterfaceClass))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_INT_SUBCLASS) &&
 -                  (id->bInterfaceSubClass != intf->desc.bInterfaceSubClass))
 -                      continue;
 -
 -              if ((id->match_flags & USB_DEVICE_ID_MATCH_INT_PROTOCOL) &&
 -                  (id->bInterfaceProtocol != intf->desc.bInterfaceProtocol))
 -                      continue;
 -
 -              return id;
 -      }
 -
 -      return NULL;
 -}
 -
+ 
 +struct find_interface_arg {
 +      int minor;
 +      struct usb_interface *interface;
 +};
  
  static int __find_interface(struct device * dev, void * data)
  {

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

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

diff --cc init/Kconfig
Simple merge