Merge branch 'for-5.1/i2c-hid' into for-next
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tue, 29 Jan 2019 10:01:17 +0000 (11:01 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tue, 29 Jan 2019 10:01:17 +0000 (11:01 +0100)
commitb1ddbed1903f35afe83d3933c9094bb7d40a993f
tree79736a451c2b7cb34989b61a8857fcaf3b407e23
parentacedafabf1bde669586c945f97087d443947a5cb
parent1475af255e18f35dc46f8a7acc18354c73d45149
Merge branch 'for-5.1/i2c-hid' into for-next

Trivial conflicts:
drivers/hid/i2c-hid/i2c-hid-core.c

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
drivers/hid/i2c-hid/i2c-hid-core.c