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

Merge branch 'egalax' into for-linus

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

77933c354c6c0e4b6abcb417518e84b8fd9b7ae4
Reading git-diff-tree failed