From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 May 2012 19:46:48 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: firefly_0821_release~3680^2~2865
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd975ae0ce13e4cbb21f13ae1222bdb6a8996ba0;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull c6x updates from Mark Salter:
 "Clean up some c6x Kconfig items and add support for Elf FDPIC loader."

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  C6X: remove unused config items
  C6X: add support to build with BINFMT_ELF_FDPIC
  C6X: change main arch kbuild symbol
---

cd975ae0ce13e4cbb21f13ae1222bdb6a8996ba0