Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenovo', 'for-4.3/logitech', 'for-4.3/multitouch', 'for-4.3/picolcd', 'for-4.3/rmi', 'for-4.3/sensor-hub', 'for-4.3/sony' and 'for-4.3/wacom' into for-linus

2015-09-01 15:37:30 +02:00
parent 067e2601d3 9a1d78a378 29e2d6d1f6 d1c48038b8 3cb5ff0220 c873d9aba7 070f63b46a 4b8a826208 9a98b3387e 21589ebda6 824deff87f 5397df15fd
20 changed files with 973 additions and 292 deletions
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -486,6 +486,7 @@ config HID_MULTITOUCH
 	  - Atmel panels
 	  - Cando dual touch panels
 	  - Chunghwa panels
+	  - CJTouch panels
 	  - CVTouch panels
 	  - Cypress TrueTouch panels
 	  - Elan Microelectronics touch panels