From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 20 Mar 2012 12:05:18 +0000 (+0100)
Subject: Merge branches 'roccat' and 'wacom' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'roccat' and 'wacom' into for-linus
---

77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51