diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 14:33:31 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 14:33:31 +0100 |
commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /MAINTAINERS | |
parent | trace: make the trace_event callbacks return enum print_line_t (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/coo... (diff) | |
download | linux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.tar.xz linux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.zip |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9c3a4f0280f6..829a697f1235 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -911,7 +911,7 @@ S: Maintained BLACKFIN ARCHITECTURE P: Bryan Wu M: cooloney@kernel.org -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) +L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported |