Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 May 2012 19:46:48 +0000 (12:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 May 2012 19:46:48 +0000 (12:46 -0700)
commitcd975ae0ce13e4cbb21f13ae1222bdb6a8996ba0
treeeb3346e529b1fc120d4bb6dd3305e0a9c8698a67
parent881bcabbde8bc13854a2cb30847abe181d31c5fd
parent8ff98b9c993d59d6b396a42266c6d323c8f28cec
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