From: Jon Medhurst <tixy@linaro.org>
Date: Thu, 12 Jun 2014 13:01:48 +0000 (+0100)
Subject: Merge branch 'lsk-3.10-gator-5.18' into lsk-3.10-gator
X-Git-Tag: firefly_0821_release~3680^2~7^2~2^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=14899ae67197e6e84cecf018f39d1be1a2d75b92;p=firefly-linux-kernel-4.4.55.git

Merge branch 'lsk-3.10-gator-5.18' into lsk-3.10-gator
---

14899ae67197e6e84cecf018f39d1be1a2d75b92