From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 23 Mar 2015 16:18:27 +0000 (-0700)
Subject: Merge tag 'v4.0-rc5' into next
X-Git-Tag: omap-for-v4.1/fixes-rc1~145^2^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188933ac139a6f8ab06cad369bd0200af947b00d;p=pandora-kernel.git

Merge tag 'v4.0-rc5' into next

Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.

Conflicts:
	drivers/input/mouse/synaptics.c
---

188933ac139a6f8ab06cad369bd0200af947b00d
Reading git-diff-tree failed