From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 4 Aug 2010 13:27:54 +0000 (+0200)
Subject: Merge branch 'upstream-fixes' into for-linus
X-Git-Tag: v2.6.36-rc1~567^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9929ffed889b4861b52ba648a44fa4add945c4d1;p=pandora-kernel.git

Merge branch 'upstream-fixes' into for-linus

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

9929ffed889b4861b52ba648a44fa4add945c4d1
Reading git-diff-tree failed