From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2015 01:24:35 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=00fd6a7194d2f3be3ecc4fde0af02b39823afdcc;p=linux.git

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.
---

00fd6a7194d2f3be3ecc4fde0af02b39823afdcc