]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech...
authorJiri Kosina <jkosina@suse.cz>
Mon, 22 Jun 2015 14:22:06 +0000 (16:22 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 22 Jun 2015 14:22:06 +0000 (16:22 +0200)
commitd00391e5fcc6f220574e6df4b1082a84b9da315b
tree745a6efbce4a42f33abf2979fff8e6be6a9f6e86
parent6eb91a4538c2dbf34abadc458315608a522e0b84
parentd1086dbc95f10b97da402f37a4878d9771d13a1e
parent488598cc9615dfcd9b69aae77279cca71134b981
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus

Conflicts:
drivers/hid/hid-logitech-hidpp.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-logitech-hidpp.c
drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/usbhid/hid-quirks.c