diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 17:42:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 17:42:03 -0500 |
| commit | 47143b094d4700842e42b0a7cc2548d7ae292690 (patch) | |
| tree | ab1e7fb7cdedd29c8a9b953e58110ff3870946e4 /MAINTAINERS | |
| parent | 0b9466ccea3c4ec363737288dd9467bf978c9c2d (diff) | |
| parent | f02cbbe657939489347cbda598401a56913ffcbd (diff) | |
Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
pci root complex: support for tile architecture
drivers/net/tile/: on-chip network drivers for the tile architecture
MAINTAINERS: add drivers/char/hvc_tile.c as maintained by tile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 98fc0450d7e1..b3be8b3d0437 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5839,6 +5839,8 @@ M: Chris Metcalf <cmetcalf@tilera.com> | |||
| 5839 | W: http://www.tilera.com/scm/ | 5839 | W: http://www.tilera.com/scm/ |
| 5840 | S: Supported | 5840 | S: Supported |
| 5841 | F: arch/tile/ | 5841 | F: arch/tile/ |
| 5842 | F: drivers/char/hvc_tile.c | ||
| 5843 | F: drivers/net/tile/ | ||
| 5842 | 5844 | ||
| 5843 | TLAN NETWORK DRIVER | 5845 | TLAN NETWORK DRIVER |
| 5844 | M: Samuel Chessman <chessman@tux.org> | 5846 | M: Samuel Chessman <chessman@tux.org> |