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

Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

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

ada8c7973b65865cf0436b73898e32992860012a
Reading git-diff-tree failed