From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 7 Jan 2011 06:34:59 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v2.6.38-rc1~463^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=554738da71004d96e06fb75f4772dfc3b0f47810;p=pandora-kernel.git

Merge branch 'next' into for-linus

Conflicts:
	include/linux/input.h
---

554738da71004d96e06fb75f4772dfc3b0f47810
Reading git-diff-tree failed