From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 19 May 2010 12:27:08 +0000 (+0200)
Subject: Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
X-Git-Tag: v2.6.35-rc1~454^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36dbe2fc5534291d261a4c63033232aa2f60c2a9;p=pandora-kernel.git

Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

Conflicts:
	drivers/hid/Makefile
---

36dbe2fc5534291d261a4c63033232aa2f60c2a9
Reading git-diff-tree failed