Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index eb325baa738a..eae0c7e468cf 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -265,6 +265,15 @@ config HID_GYRATION
         ---help---
         Support for Gyration remote control.
 
+config HID_ICADE
+        tristate "ION iCade arcade controller"
+        depends on BT_HIDP
+        ---help---
+        Support for the ION iCade arcade controller to work as a joystick.
+
+        To compile this driver as a module, choose M here: the
+        module will be called hid-icade.
+
 config HID_TWINHAN
         tristate "Twinhan IR remote control"
         depends on USB_HID
@@ -728,4 +737,6 @@ endif # HID
 
 source "drivers/hid/usbhid/Kconfig"
 
+source "drivers/hid/i2c-hid/Kconfig"
+
 endmenu