From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 Apr 2015 09:03:02 +0000 (+0200)
Subject: Merge 4.0-rc7 into staging-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~165^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c610f7f772aa06ae2bd8e5ace87cde4d90f70198;p=pandora-kernel.git

Merge 4.0-rc7 into staging-next

We want those fixes (iio primarily) into the -next branch to help with
merge and testing issues.

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

c610f7f772aa06ae2bd8e5ace87cde4d90f70198
Reading git-diff-tree failed