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)
commit702e97621ec7e7a36034ebd7a446af04f59d6dee
treea536f3c2bd891ac8038690482289cabf59eaa6b7
parentcc4a41fe5541a73019a864883297bd5043aa6d98
parent636d42117800db1a994726fcf017e3633db832a5
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

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