From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 16 Dec 2010 17:17:48 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input... 
X-Git-Tag: v2.6.38-rc1~463^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb;p=pandora-kernel.git

Merge branch 'next' of git://git./linux/kernel/git/rydberg/input-mt into next

Conflicts:
	drivers/input/Makefile
---

67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb
Reading git-diff-tree failed