]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10dcaf3 0149931)
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)
Conflicts:
drivers/hid/wacom_wac.c


Trivial merge
Linux kernel for KaRo TX COM modules