summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-07-29 17:37:52 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-07-29 17:37:52 +1000
commit491c465e48ba877e787db88a02ca45e686abbbc2 (patch)
tree729a2e6799ab20fb85ac6c487a0c84a73236413c /MAINTAINERS
parentc04d9f49ac7ecad401fca7a71eae7d68f2ac3378 (diff)
parent16eb2bfc65ef86d3ac6420d50ddc2c48f0023cee (diff)
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts: drivers/Kconfig drivers/Makefile drivers/dma/Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9430bbf81992..ed186b5dbf60 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7888,6 +7888,11 @@ S: Maintained
F: include/linux/mmc/dw_mmc.h
F: drivers/mmc/host/dw_mmc*
+THUNDERBOLT DRIVER
+M: Andreas Noever <andreas.noever@gmail.com>
+S: Maintained
+F: drivers/thunderbolt/
+
TIMEKEEPING, CLOCKSOURCE CORE, NTP
M: John Stultz <john.stultz@linaro.org>
M: Thomas Gleixner <tglx@linutronix.de>