From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 4 Jul 2013 13:02:26 +0000 (+0200)
Subject: Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into... 
X-Git-Tag: v3.11-rc1~90^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ec2dcc3527a20c619aca2fb36f800908256bac;p=pandora-kernel.git

Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus

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

08ec2dcc3527a20c619aca2fb36f800908256bac
Reading git-diff-tree failed