aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-05 08:33:31 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-05 08:33:31 -0500
commit43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch)
tree8a7f36985f9ef8e6771163c751eeefd22ee71693 /MAINTAINERS
parentae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff)
parenteda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff)
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
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
911BLACKFIN ARCHITECTURE 911BLACKFIN ARCHITECTURE
912P: Bryan Wu 912P: Bryan Wu
913M: cooloney@kernel.org 913M: cooloney@kernel.org
914L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) 914L: uclinux-dist-devel@blackfin.uclinux.org
915W: http://blackfin.uclinux.org 915W: http://blackfin.uclinux.org
916S: Supported 916S: Supported
917 917