]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-4.2/logitech' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 Jun 2015 12:39:55 +0000 (14:39 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 Jun 2015 12:39:55 +0000 (14:39 +0200)
commit1fb1c98e3be33a119e2b1dff03786ec356546d0e
tree20ff2bad921b89cfe00e25da8764bd95b5288f17
parent5b508e01b8086df8b21fb127dc6a442ca3d545d6
parent8a09b4fadf320cef081e1539975a97793cfb9076
Merge branch 'for-4.2/logitech' into for-next

Conflicts:
drivers/hid/hid-logitech-hidpp.c
drivers/hid/hid-core.c
drivers/hid/hid-logitech-hidpp.c