From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 12 May 2015 22:35:14 +0000 (-0700)
Subject: Merge branch 'v3.10/topic/gator' into linux-linaro-lsk-v3.10
X-Git-Tag: firefly_0821_release~3680^2~7^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=106f1ce29f1fa7ad18e47823789c176df57d75ee;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v3.10/topic/gator' into linux-linaro-lsk-v3.10

* v3.10/topic/gator:
  gator: Enable multiple source copies to exist in Android build environments
  gator: Add config for building the module in-tree
  gator: Version 5.21.1
---

106f1ce29f1fa7ad18e47823789c176df57d75ee