From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 19 May 2010 12:04:49 +0000 (+0200)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: v2.6.35-rc1~454^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7426ef52b42ebd54ba85133ffd29132e008a882c;p=pandora-kernel.git

Merge branch 'upstream' into for-linus

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

7426ef52b42ebd54ba85133ffd29132e008a882c
Reading git-diff-tree failed