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

Merge branch 'cando' into for-linus

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

896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68
Reading git-diff-tree failed