diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 16:03:51 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 16:03:51 (GMT) |
commit | 0bfdbf0e79ab20394c932f27f6d3a34b757035ef (patch) | |
tree | e3876afb8842067a52dfccbb5a9393fd81db5ab5 /MAINTAINERS | |
parent | 413df1cb434b9b73b517f78c231549add1ee1c99 (diff) | |
parent | 5596b0b245fb9d2cefb5023b11061050351c1398 (diff) | |
download | linux-fsl-qoriq-0bfdbf0e79ab20394c932f27f6d3a34b757035ef.tar.xz |
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
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions