From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Aug 2017 18:52:01 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.13-rc4~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull MIPS fixes from Ralf Baechle:
 "This fixes two build issues for ralink platforms, both due to missing
  #includes which used to be included indirectly via other headers"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: ralink: mt7620: Add missing header
  MIPS: ralink: Fix build error due to missing header
---

6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c