Merge branch 'cando' into for-linus

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ac8e12d00c0f..98c4ff752186 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -86,6 +86,12 @@ config HID_BELKIN
         ---help---
         Support for Belkin Flip KVM and Wireless keyboard.
 
+config HID_CANDO
+        tristate "Cando dual touch panel"
+        depends on USB_HID
+        ---help---
+        Support for Cando dual touch panel.
+
 config HID_CHERRY
         tristate "Cherry" if EMBEDDED
         depends on USB_HID