From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 7 Apr 2015 15:46:23 +0000 (-0700)
Subject: Merge tag 'v4.0-rc7' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5f63e885ac32429fc1340f5a61e1484022efc773;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'v4.0-rc7' into next

Sync up with Linux 4.0-rc7 to bring in ALPS changes.
---

5f63e885ac32429fc1340f5a61e1484022efc773