commit 0bfdbf0e79ab20394c932f27f6d3a34b757035ef
author Linus Torvalds <torvalds@linux-foundation.org> Fri Oct 04 09:03:51 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Oct 04 09:03:51 2013 -0700
tree e3876afb8842067a52dfccbb5a9393fd81db5ab5
parent 413df1cb434b9b73b517f78c231549add1ee1c99
parent 5596b0b245fb9d2cefb5023b11061050351c1398

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