Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic...
authorJiri Kosina <jkosina@suse.cz>
Mon, 13 Apr 2015 21:41:15 +0000 (23:41 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 13 Apr 2015 21:41:15 +0000 (23:41 +0200)

Trivial merge