From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Nov 2013 19:36:41 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.12~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=17f6ee43c336924d1d5fa80c64a270f963304556;p=linux-2.6-block.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "Three fixes across arch/mips with the most complex one being the GIC
  interrupt fix - at nine lines still not monster.  I'm confident this
  are the final MIPS patches even if there should go for an rc8"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: ralink: fix return value check in rt_timer_probe()
  MIPS: malta: Fix GIC interrupt offsets
  MIPS: Perf: Fix 74K cache map
---

17f6ee43c336924d1d5fa80c64a270f963304556