From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Jun 2015 17:19:40 +0000 (-0700)
Subject: Merge 4.1-rc7 into driver-core-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~93^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=987aec39a74373c55c3bedd5c3c83896d78fd0a2;p=pandora-kernel.git

Merge 4.1-rc7 into driver-core-next

We want the fixes in this branch as well for testing and merge
resolution.

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

987aec39a74373c55c3bedd5c3c83896d78fd0a2
Reading git-diff-tree failed