From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 22 May 2012 09:33:42 +0000 (+0200)
Subject: Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
X-Git-Tag: v3.5-rc1~138^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc;p=pandora-kernel.git

Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

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

99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc
Reading git-diff-tree failed