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

Merge 4.2-rc4 into staging-next

We want the iio and other fixes in this branch as well.

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

6e64e22449023dc89dfb92c6f19d4c5b03f46889
Reading git-diff-tree failed