projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 413df1c 5596b0b)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Oct 2013 16:03:51 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Oct 2013 16:03:51 +0000 (09:03 -0700)
commit0bfdbf0e79ab20394c932f27f6d3a34b757035ef
treee3876afb8842067a52dfccbb5a9393fd81db5ab5tree | snapshot
parent413df1cb434b9b73b517f78c231549add1ee1c99commit | diff
parent5596b0b245fb9d2cefb5023b11061050351c1398commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.