Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Oct 2018 22:39:25 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Oct 2018 22:39:25 +0000 (15:39 -0700)
commitadb6b2b2b59f7872322f255206583b4c3ce661a3
treefbd47387eff4148e5d34236d06ae7cc102758e99
parent9b5cf826ef8b607d452ba7bf683ae5510a745232
parent4d8106f0299c7942c5f13a22da6d553d28127ef5
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull c6x update from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: switch to NO_BOOTMEM
arch/c6x/kernel/setup.c