From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 30 Apr 2013 08:17:48 +0000 (+0200)
Subject: Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
X-Git-Tag: v3.12-rc1~968^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72c16d9a5c303dce928a52a8861fe7a2a25f849a;p=kernel%2Fkernel-generic.git

Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus

Conflicts:
	drivers/hid/hid-multitouch.c
---

72c16d9a5c303dce928a52a8861fe7a2a25f849a