From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 23 Oct 2010 20:49:32 +0000 (+0200)
Subject: Merge branch 'uc-logic' into for-linus
X-Git-Tag: v2.6.37-rc1~144^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b66a16f25f819bb1f132f075c5c01a288776cf8;p=pandora-kernel.git

Merge branch 'uc-logic' into for-linus

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c
---

8b66a16f25f819bb1f132f075c5c01a288776cf8
Reading git-diff-tree failed