From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 1 Oct 2012 12:38:54 +0000 (+0200)
Subject: Merge branch 'multitouch' into for-linus
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~104^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa;p=pandora-kernel.git

Merge branch 'multitouch' into for-linus

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

cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa
Reading git-diff-tree failed