Merge branch 'master' into for-upstream

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile

diff --cc Documentation/ABI/testing/sysfs-bus-usb
index 273a7f0,df6c8a0..7772928
--- 1/Documentation/ABI/testing/sysfs-bus-usb
--- 2/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@@ -86,45 -86,18 +86,61 @@@ Users
                PowerTOP <power@bughost.org>
                http://www.lesswatts.org/projects/powertop/
  
+ What:         /sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
+ Date:         January 2008
+ KernelVersion:        2.6.27
+ Contact:      Sarah Sharp <sarah.a.sharp@intel.com>
+ Description:
+               When read, this file returns 1 if the interface driver
+               for this interface supports autosuspend.  It also
+               returns 1 if no driver has claimed this interface, as an
+               unclaimed interface will not stop the device from being
+               autosuspended if all other interface drivers are idle.
+               The file returns 0 if autosuspend support has not been
+               added to the driver.
+ Users:
+               USB PM tool
+               git://git.moblin.org/users/sarah/usb-pm-tool/
++
 +What:         /sys/bus/usb/device/.../authorized
 +Date:         July 2008
 +KernelVersion:        2.6.26
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              Authorized devices are available for use by device
 +              drivers, non-authorized one are not.  By default, wired
 +              USB devices are authorized.
 +
 +              Certified Wireless USB devices are not authorized
 +              initially and should be (by writing 1) after the
 +              device has been authenticated.
 +
 +What:         /sys/bus/usb/device/.../wusb_cdid
 +Date:         July 2008
 +KernelVersion:        2.6.27
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              For Certified Wireless USB devices only.
 +
 +              A devices's CDID, as 16 space-separated hex octets.
 +
 +What:         /sys/bus/usb/device/.../wusb_ck
 +Date:         July 2008
 +KernelVersion:        2.6.27
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              For Certified Wireless USB devices only.
 +
 +              Write the device's connection key (CK) to start the
 +              authentication of the device.  The CK is 16
 +              space-separated hex octets.
 +
 +What:         /sys/bus/usb/device/.../wusb_disconnect
 +Date:         July 2008
 +KernelVersion:        2.6.27
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              For Certified Wireless USB devices only.
 +
 +              Write a 1 to force the device to disconnect
 +              (equivalent to unplugging a wired USB device).

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 8eedbfa,4853f9d..e1521f3
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1220,10 -1254,12 +1254,14 @@@ source "drivers/hid/Kconfig
  
  source "drivers/usb/Kconfig"
  
 +source "drivers/uwb/Kconfig"
 +
  source "drivers/mmc/Kconfig"
  
+ source "drivers/memstick/Kconfig"
+ 
+ source "drivers/accessibility/Kconfig"
+ 
  source "drivers/leds/Kconfig"
  
  source "drivers/rtc/Kconfig"

diff --cc arch/h8300/Kconfig
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
index 1a6930f,46c8681..cadc64f
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -99,4 -99,4 +99,5 @@@ obj-$(CONFIG_OF)              += of
  obj-$(CONFIG_SSB)             += ssb/
  obj-$(CONFIG_VIRTIO)          += virtio/
  obj-$(CONFIG_REGULATOR)               += regulator/
+ obj-$(CONFIG_STAGING)         += staging/
 +obj-$(CONFIG_UWB)             += uwb/