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)
commit6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c
treebdca54f356ed8ab6edd5958e95e03e4609ca6b5a
parentfbb77611e95d3d5b2af86a59754a3130877cb667
parentf13343e87713959437a4a50a730de1736f23fc20
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