diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
| commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
| tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /MAINTAINERS | |
| parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
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 | |||
| 911 | BLACKFIN ARCHITECTURE | 911 | BLACKFIN ARCHITECTURE |
| 912 | P: Bryan Wu | 912 | P: Bryan Wu |
| 913 | M: cooloney@kernel.org | 913 | M: cooloney@kernel.org |
| 914 | L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | 914 | L: uclinux-dist-devel@blackfin.uclinux.org |
| 915 | W: http://blackfin.uclinux.org | 915 | W: http://blackfin.uclinux.org |
| 916 | S: Supported | 916 | S: Supported |
| 917 | 917 | ||