From: Jiri Kosina Date: Tue, 20 Mar 2012 12:05:18 +0000 (+0100) Subject: Merge branches 'roccat' and 'wacom' into for-linus X-Git-Tag: firefly_0821_release~3680^2~3337^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51;p=firefly-linux-kernel-4.4.55.git Merge branches 'roccat' and 'wacom' into for-linus --- 77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51