From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 12 May 2015 22:27:07 +0000 (-0700)
Subject: Merge branch 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kerne... 
X-Git-Tag: firefly_0821_release~3680^2~7^2~2^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ed41f1a9564c0733ad155b742ac66fb41d2f9d3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel into v3.10/topic/gator

* 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel:
  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
---

0ed41f1a9564c0733ad155b742ac66fb41d2f9d3