summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 07:42:03 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 07:42:03 +0900
commit47143b094d4700842e42b0a7cc2548d7ae292690 (patch)
treeab1e7fb7cdedd29c8a9b953e58110ff3870946e4 /MAINTAINERS
parent0b9466ccea3c4ec363737288dd9467bf978c9c2d (diff)
parentf02cbbe657939489347cbda598401a56913ffcbd (diff)
downloadlinux-3.10-47143b094d4700842e42b0a7cc2548d7ae292690.tar.gz
linux-3.10-47143b094d4700842e42b0a7cc2548d7ae292690.tar.bz2
linux-3.10-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--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 98fc0450d7e..b3be8b3d043 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>