From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 20 Mar 2012 12:18:05 +0000 (+0100)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: v3.4-rc1~176^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a247a4119ee932e06e985e0a95a13c3eed4715b;p=pandora-kernel.git

Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/Makefile
---

4a247a4119ee932e06e985e0a95a13c3eed4715b
Reading git-diff-tree failed