From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 27 Mar 2012 07:27:10 +0000 (-0700)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v3.4-rc1~28^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993808253ca256b8ca7f8ff90d9935d7c99cd32d;p=pandora-kernel.git

Merge branch 'next' into for-linus

Conflicts:
	drivers/input/tablet/wacom_sys.c
---

993808253ca256b8ca7f8ff90d9935d7c99cd32d
Reading git-diff-tree failed