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)
commit00fd6a7194d2f3be3ecc4fde0af02b39823afdcc
tree9c720cbb271a42014ca6c256da5741f4b04feff2
parentd72aee78e9bb956265480a118bdba2fc99dbf4bf
parentc861519fcf95b2d46cb4275903423b43ae150a40
Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

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.