diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-16 11:11:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-16 11:11:31 -0700 |
| commit | d34e14f690d611ffe3db09e4ed8123d86c89a831 (patch) | |
| tree | dc7d6716e2550834816e29e5928a60c00c97d9fc /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| parent | MIPS: Oprofile: Fix Loongson irq handler (diff) | |
| download | linux-dev-d34e14f690d611ffe3db09e4ed8123d86c89a831.tar.xz linux-dev-d34e14f690d611ffe3db09e4ed8123d86c89a831.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Oprofile: Fix Loongson irq handler
MIPS: N32: Use compat version for sys_ppoll.
MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions