Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/Kconfig
index 1130a89,342be43,d2c9734,3cbe8cc,1130a89,9907dc9..2b006bf
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
--- 4/drivers/hid/Kconfig
--- 5/drivers/hid/Kconfig
--- 6/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@@@ -589,7 -589,6 -606,6 -590,6 -589,7 -589,8 +607,8 @@@@@@@ config HID_WACOM_POWER_SUPPL
      config HID_WIIMOTE
        tristate "Nintendo Wii Remote support"
        depends on BT_HIDP
 +++    depends on LEDS_CLASS
+++++   select POWER_SUPPLY
        ---help---
        Support for the Nintendo Wii Remote bluetooth device.
      

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge