Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Aug 2017 18:52:01 +0000 (11:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Aug 2017 18:52:01 +0000 (11:52 -0700)
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


Trivial merge