Merge tag 'mips-fixes_5.12_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2021 15:57:50 +0000 (08:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2021 15:57:50 +0000 (08:57 -0700)
commit2bb25b3a748af6f11df42298e80b9863ed23f2b3
tree7f9dcdee96945742be43bd3ab7139a16dc67c629
parenta080642d2f831cc34b68663c0db1c447d3807421
parent9ae31e2ab293bf4d9c42e7079b156072f8a7f8ca
Merge tag 'mips-fixes_5.12_3' of git://git./linux/kernel/git/mips/linux

Pull MIPS fix from Thomas Bogendoerfer:

 - Fix compile error with option MIPS_ELF_APPENDED_DTB

* tag 'mips-fixes_5.12_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: kernel: setup.c: fix compilation error