diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 11:21:55 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 11:21:55 -0700 |
| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /MAINTAINERS | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
| parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 (diff) | |
| download | blackbird-op-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.tar.gz blackbird-op-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.zip | |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8395f2eeb782..4d544ffde184 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5303,8 +5303,8 @@ F: drivers/*/*s3c2410* F: drivers/*/*/*s3c2410* TI DAVINCI MACHINE SUPPORT -P: Kevin Hilman -M: davinci-linux-open-source@linux.davincidsp.com +M: Kevin Hilman <khilman@deeprootsystems.com> +L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) Q: http://patchwork.kernel.org/project/linux-davinci/list/ S: Supported F: arch/arm/mach-davinci |
