From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 30 Apr 2013 08:19:07 +0000 (+0200)
Subject: Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into... 
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~105^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047dff63f913c21c5228b94118e7996ab998cdc4;p=pandora-kernel.git

Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus

Conflicts:
	drivers/hid/Kconfig
---

047dff63f913c21c5228b94118e7996ab998cdc4
Reading git-diff-tree failed