From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 24 Jul 2012 11:40:06 +0000 (+0200)
Subject: Merge branch 'uhid' into for-linus
X-Git-Tag: v3.6-rc1~119^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c062c4d1de57789bf15f7641a24c429eeb8a1c6a;p=pandora-kernel.git

Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig
---

c062c4d1de57789bf15f7641a24c429eeb8a1c6a
Reading git-diff-tree failed