From: Mark Brown <broonie@linaro.org>
Date: Mon, 30 Dec 2013 13:45:00 +0000 (+0000)
Subject: Merge tag 'v3.13-rc6' into spi-rcar
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=68e67d97e1f91ed11e041b67f3a1336f518c608f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'v3.13-rc6' into spi-rcar

To resolve spurious merge conflicts with fixes.

Linux 3.13-rc6
---

68e67d97e1f91ed11e041b67f3a1336f518c608f