Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17...
authorJiri Kosina <jkosina@suse.cz>
Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)

Trivial merge