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

Merge branch 'upstream' into for-linus

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

fc73697bd5bf4efe8b5b2b78ec09e00f967cd055
Reading git-diff-tree failed