From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Aug 2015 16:07:25 +0000 (-0700)
Subject: Merge 4.2-rc6 into staging-next
X-Git-Tag: omap-for-v4.3/fixes-merge-window~44^2~141
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f70d6318320983a8d2fac28cfe8d22dfd5e52a73;p=pandora-kernel.git

Merge 4.2-rc6 into staging-next

We want the IIO and staging fixes in here as well.

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

f70d6318320983a8d2fac28cfe8d22dfd5e52a73
Reading git-diff-tree failed