diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 23:42:03 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 23:42:03 +0100 |
commit | 47143b094d4700842e42b0a7cc2548d7ae292690 (patch) | |
tree | ab1e7fb7cdedd29c8a9b953e58110ff3870946e4 /MAINTAINERS | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | pci root complex: support for tile architecture (diff) | |
download | linux-47143b094d4700842e42b0a7cc2548d7ae292690.tar.xz linux-47143b094d4700842e42b0a7cc2548d7ae292690.zip |
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> W: http://www.tilera.com/scm/ S: Supported F: arch/tile/ +F: drivers/char/hvc_tile.c +F: drivers/net/tile/ TLAN NETWORK DRIVER M: Samuel Chessman <chessman@tux.org> |