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

Merge 4.2-rc3 into staging-next

We need the staging fixes in here as well.

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

ed15e8880fc3d8d52bc02a02521054bfcb26264a
Reading git-diff-tree failed