From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 4 Jan 2009 00:04:09 +0000 (+0100)
Subject: Merge branch 'upstream-fixes' into for-next
X-Git-Tag: v2.6.29-rc1~498^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed42350e02bfcb333024949e9653d06916135cc5;p=pandora-kernel.git

Merge branch 'upstream-fixes' into for-next

Conflicts:

	drivers/hid/hid-ids.h
---

ed42350e02bfcb333024949e9653d06916135cc5
Reading git-diff-tree failed