From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Dec 2008 19:26:34 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~16547
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fae1aa4a0bcfdd35735a38949650216aee964474;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP32: Update defconfig
  MIPS: Add missing calls to plat_unmap_dma_mem.
  MIPS: Kconfig: Fix the arch-specific header path
  MIPS: Use EI/DI for MIPS R2.
---

fae1aa4a0bcfdd35735a38949650216aee964474