From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Sep 2013 01:27:03 +0000 (-0700)
Subject: Merge 3.12-rc3 into char-misc-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7173493683853047d6efc8d4454c70469a7b033;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge 3.12-rc3 into char-misc-next

We need/want the mei fixes in here so we can apply other updates that
are depending on them.

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

d7173493683853047d6efc8d4454c70469a7b033