From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 2 Feb 2010 22:10:39 +0000 (+0100)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.34-rc1~293^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1a0bdd8022317e98650e70850de73eccfcde5ad;p=pandora-kernel.git

Merge branch 'master' into upstream

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

e1a0bdd8022317e98650e70850de73eccfcde5ad
Reading git-diff-tree failed