diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /MAINTAINERS | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
| parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 (diff) | |
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* | |||
| 5303 | F: drivers/*/*/*s3c2410* | 5303 | F: drivers/*/*/*s3c2410* |
| 5304 | 5304 | ||
| 5305 | TI DAVINCI MACHINE SUPPORT | 5305 | TI DAVINCI MACHINE SUPPORT |
| 5306 | P: Kevin Hilman | 5306 | M: Kevin Hilman <khilman@deeprootsystems.com> |
| 5307 | M: davinci-linux-open-source@linux.davincidsp.com | 5307 | L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) |
| 5308 | Q: http://patchwork.kernel.org/project/linux-davinci/list/ | 5308 | Q: http://patchwork.kernel.org/project/linux-davinci/list/ |
| 5309 | S: Supported | 5309 | S: Supported |
| 5310 | F: arch/arm/mach-davinci | 5310 | F: arch/arm/mach-davinci |