diff options
| author | Linus Torvalds <[email protected]> | 2013-05-28 16:23:23 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-05-28 16:23:23 +0000 |
| commit | 3c48dd49646f156158c1a96ec637b9f987f517fe (patch) | |
| tree | fd237f8d15074794e3268ce4d91bb2a16ed37ee0 /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | m68k: Update defconfigs for v3.9 (diff) | |
| download | kernel-3c48dd49646f156158c1a96ec637b9f987f517fe.tar.gz kernel-3c48dd49646f156158c1a96ec637b9f987f517fe.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
- futex support that I had missed before,
- A long-overdue update of the m68k defconfigs.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Update defconfigs for v3.9
m68k: implement futex.h to support userspace robust futexes and PI mutexes
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions