]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commitab8bd29428b8ff300932861f1f7764c609270603
tree4366d3bed8ecec74d1682f1eb1d3cfb04698c2de
parent88a29e668da61196ab1abae9b7434d35428e17ef
parent8fac1722140019d6a53f7b280f8b785707a16f66
Merge branch 'for-4.1/wacom' into for-next

Conflicts:
drivers/hid/wacom_wac.c
drivers/hid/wacom_wac.c