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

Merge branch 'upstream-fixes' into for-linus

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

f6f12427844516bc8e9cf84f43aca7bbbaa48157
Reading git-diff-tree failed