]> 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: 88a29e6 8fac172)
Merge branch 'for-4.1/wacom' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 11 Mar 2015 15:52:53 +0000 (11:52 -0400)
committerJiri Kosina <jkosina@suse.cz>
Wed, 11 Mar 2015 15:52:53 +0000 (11:52 -0400)
Conflicts:
drivers/hid/wacom_wac.c

1  2 
drivers/hid/wacom_wac.c patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/wacom_wac.c
Simple merge
Linux kernel for KaRo TX COM modules