commit 17f6ee43c336924d1d5fa80c64a270f963304556
author Linus Torvalds <torvalds@linux-foundation.org> Sun Nov 03 11:36:41 2013 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Nov 03 11:36:41 2013 -0800
tree b4e33ad9579d9653327618a51f65696c77dc1178
parent 9bf76ca325d5e9208eb343f7bd4cc666f703ed30
parent cd5d58108e41b0edecc1e7a6468cbe06ce03be3f

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/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