Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2015 01:24:35 +0000 (17:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2015 01:24:35 +0000 (17:24 -0800)
Pull MIPS fix from Ralf Baechle:
 "Just a fix for empty loops that may be removed by non-antique GCC"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix delay loops which may be removed by GCC.


Trivial merge