diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:03:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:03:51 -0700 |
| commit | 0bfdbf0e79ab20394c932f27f6d3a34b757035ef (patch) | |
| tree | e3876afb8842067a52dfccbb5a9393fd81db5ab5 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | MIPS: Fix forgotten preempt_enable() when CPU has inclusive pcaches (diff) | |
| download | linux-dev-0bfdbf0e79ab20394c932f27f6d3a34b757035ef.tar.xz linux-dev-0bfdbf0e79ab20394c932f27f6d3a34b757035ef.zip | |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions