Merge branch 'uc-logic' into for-linus

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index b9877a86eca7..834ef47b76d6 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -413,6 +413,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         map_key_clear(BTN_STYLUS);
                         break;
 
+                case 0x46: /* TabletPick */
+                        map_key_clear(BTN_STYLUS2);
+                        break;
+
                 default:  goto unknown;
                 }
                 break;