]> 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)
commitef5d40abb2fe31fae71e9b6e5feb862edbf0455b
tree745a6efbce4a42f33abf2979fff8e6be6a9f6e86
parentb77f88a047b49eef8de745eb8f6e5b3a5291d838
parent2eadec33304c2ba91cb120f49736385b8d14f4d9
parent0ebb3833d2a18b2a447362dd82f1e35e787bc459
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