projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b50b9d3 7da85fb)
Merge branch 'for-4.15/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:10:38 +0000 (11:10 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:10:38 +0000 (11:10 +0100)
- cp2112: GPIO error handling and Kconfig fixes from Sébastien Szymanski
- i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede
- Input/Core: add eraser tool support, from Ping Cheng
- small assorted code fixes

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1  2 
drivers/hid/Kconfig patch | diff1 | diff2 | blob | history
drivers/hid/hid-core.c patch | diff1 | diff2 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | blob | history
drivers/hid/i2c-hid/i2c-hid.c patch | diff1 | diff2 | blob | history
include/linux/hid.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge
diff --cc include/linux/hid.h
Simple merge
MicroBlaze GIT Repository