From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Jun 2015 17:34:44 +0000 (-0700)
Subject: Merge 4.1-rc7 into staging-testing
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~92^2~362
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6394d6d01bf0881823522f37601cbf880bc61087;p=pandora-kernel.git

Merge 4.1-rc7 into staging-testing

We want the staging tree fixes in here too to help with testing and
merge issues.

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

6394d6d01bf0881823522f37601cbf880bc61087
Reading git-diff-tree failed