From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 12 Dec 2014 10:09:23 +0000 (+0100)
Subject: Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
X-Git-Tag: v3.19-rc1~105^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=3ee420ba2e7fa074a668e30c2d0f4abd317e4927

Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus

Conflicts:
	drivers/hid/hid-input.c
---

3ee420ba2e7fa074a668e30c2d0f4abd317e4927
diff --cc drivers/hid/hid-ids.h
index a7c1c1d9706d,7c863738e419,08cf4e75c3bb..40627c713519
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@ -298,10 -298,9 -298,6 +298,10 @@@@
   
   #define USB_VENDOR_ID_ELAN		0x04f3
   #define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089
  +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b
  +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103	0x0103
 ++#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c	0x010c
  +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F	0x016f
   
   #define USB_VENDOR_ID_ELECOM		0x056e
   #define USB_DEVICE_ID_ELECOM_BM084	0x0061
diff --cc drivers/hid/hid-input.c
index 725f22ca47fc,725f22ca47fc,7ea582be9c9a..be3eba8b9731
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@@ -865,14 -865,14 -862,7 +865,14 @@@@ static void hidinput_configure_usage(st
   		case 0x28b: map_key_clear(KEY_FORWARDMAIL);	break;
   		case 0x28c: map_key_clear(KEY_SEND);		break;
   
  +		case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV);		break;
  +		case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT);		break;
  +		case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP);		break;
  +		case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP);		break;
  +		case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);	break;
  +		case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);	break;
  +
-- 		default:    goto ignore;
++ 		default: map_key_clear(KEY_UNKNOWN);
   		}
   		break;