]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-4.1/wacom' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 2 Apr 2015 12:19:54 +0000 (14:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 2 Apr 2015 12:19:54 +0000 (14:19 +0200)
commitaf73ad0a4ced974d73d7ff9c4384a7e350e0e42c
tree9b16a2589b9c0bcc99dacdfa6b7bb4cd9b74caaf
parent10dcaf31233a89990a548ff504d873d0f8d43aed
parent0149931e6d2fa995fbcee590bb6cf9007a8839fc
Merge branch 'for-4.1/wacom' into for-next

Conflicts:
drivers/hid/wacom_wac.c