Merge branch 'lsk-3.10-armlt-fixes' of git://git.linaro.org/landing-teams/working...
authorKevin Hilman <khilman@linaro.org>
Tue, 28 Apr 2015 15:09:22 +0000 (08:09 -0700)
committerKevin Hilman <khilman@linaro.org>
Tue, 28 Apr 2015 15:09:22 +0000 (08:09 -0700)
* '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


Trivial merge