From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 25 Oct 2011 07:59:04 +0000 (+0200)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: v3.2-rc1~187^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3aec7b686329e6bb65aa08c7f9458f7fd512f06;p=pandora-kernel.git

Merge branch 'upstream' into for-linus

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

b3aec7b686329e6bb65aa08c7f9458f7fd512f06
Reading git-diff-tree failed