From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 22 May 2012 09:32:31 +0000 (+0200)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: v3.5-rc1~138^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56ccd186f1837dd418cd094f0e96b3196bbab9ef;p=pandora-kernel.git

Merge branch 'upstream' into for-linus

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

56ccd186f1837dd418cd094f0e96b3196bbab9ef
Reading git-diff-tree failed