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

Conflicts:
	drivers/hid/hid-input.c

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

diff --cc drivers/hid/hid-ids.h
index a7c1c1d9706da3f077042e49e1be752829174f93,7c863738e419969a9dd0115ca7321d884034ae59,08cf4e75c3bb0d8bdac4877763da5615f6055381..40627c713519e97dbcad630915342b8d6e7b7f5c
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/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 725f22ca47fcb808401dc08120ad0366bb9d9d69,725f22ca47fcb808401dc08120ad0366bb9d9d69,7ea582be9c9aeac1dd67716bfa325c37d3aef00f..be3eba8b973117347224acf86c43e5d093ef8a7d
--- 1/drivers/hid/hid-input.c
--- 2/drivers/hid/hid-input.c
--- 3/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;
   
--              default:    goto ignore;
  +             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: map_key_clear(KEY_UNKNOWN);
                }
                break;