Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Aug 2017 18:15:46 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Aug 2017 18:15:46 +0000 (11:15 -0700)
Pull c6x tweaks from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: Convert to using %pOF instead of full_name
  c6x: defconfig: Cleanup from old Kconfig options


Trivial merge