From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Oct 2013 16:03:51 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.12-rc4~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bfdbf0e79ab20394c932f27f6d3a34b757035ef;p=kernel%2Fkernel-generic.git

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

Pull MIPS fixes from Ralf Baechle:
 "Two small fixes for 3.12 only this week.  I have a few more fixes
  pending but those are conceptually more complex so will have to wait
  for a bit longer"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix forgotten preempt_enable() when CPU has inclusive pcaches
  MIPS: Alchemy: MTX-1: fix incorrect placement of __initdata tag
---

0bfdbf0e79ab20394c932f27f6d3a34b757035ef