From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Mar 2015 20:36:48 +0000 (+0100)
Subject: Merge 4.0-rc5 into staging-testing
X-Git-Tag: omap-for-v4.1/fixes-rc1~165^2~138^2~210
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807dc0668e7af56a49cf360c2d12f9b04083ac47;p=pandora-kernel.git

Merge 4.0-rc5 into staging-testing

We want the staging tree fixes that are upstream here as well to prevent
merge conflicts from people trying to clean up code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

807dc0668e7af56a49cf360c2d12f9b04083ac47
Reading git-diff-tree failed