Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/Kconfig
index 00445bc3019c019e51aed46880aaebb81170d5c9,8cca0af2dbd1b8c84233acadb92c3418d730385f..fbf49503508d8aa79a5e0cc4c901b716bb1233b6
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -53,6 -59,32 +53,27 @@@ config HIDRA
  
        If unsure, say Y.
  
 -source "drivers/hid/usbhid/Kconfig"
 -
 -menu "Special HID drivers"
 -      depends on HID
 -
+ config UHID
+       tristate "User-space I/O driver support for HID subsystem"
+       depends on HID
+       default n
+       ---help---
+       Say Y here if you want to provide HID I/O Drivers from user-space.
+       This allows to write I/O drivers in user-space and feed the data from
+       the device into the kernel. The kernel parses the HID reports, loads the
+       corresponding HID Device Driver or provides input devices on top of your
+       user-space device.
+ 
+       This driver cannot be used to parse HID-reports in user-space and write
+       special HID-drivers. You should use hidraw for that.
+       Instead, this driver allows to write the transport-layer driver in
+       user-space like USB-HID and Bluetooth-HID do in kernel-space.
+ 
+       If unsure, say N.
+ 
+       To compile this driver as a module, choose M here: the
+       module will be called uhid.
+ 
  config HID_GENERIC
        tristate "Generic HID driver"
        depends on HID

diff --cc drivers/hid/Makefile
Simple merge

diff --cc include/linux/Kbuild
Simple merge