From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 28 Apr 2015 15:09:22 +0000 (-0700)
Subject: Merge branch 'lsk-3.10-armlt-fixes' of git://git.linaro.org/landing-teams/working... 
X-Git-Tag: firefly_0821_release~3680^2~10^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41e72f5c4726e19a5958d9ffdbc0af7b3f79d091;p=firefly-linux-kernel-4.4.55.git

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

* 'lsk-3.10-armlt-fixes' of git://git.linaro.org/landing-teams/working/arm/kernel:
  arm64: psci: move psci firmware calls out of line
  configs: Remove duplicate CONFIG_FUNCTION_TRACER
  kconfig: Fix warning "‘jump’ may be used uninitialized"
  kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
  scripts/sortextable: suppress warning: `relocs_size' may be used uninitialized
  netfilter: nfnetlink_queue: Fix "discards ‘const’ qualifier" warning
  drm/cma: Fix printk formats in drm_gem_cma_describe
---

41e72f5c4726e19a5958d9ffdbc0af7b3f79d091