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-Url: https://git.stricted.de/?a=commitdiff_plain;h=987aec39a74373c55c3bedd5c3c83896d78fd0a2;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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