diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 16:55:07 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 16:55:07 +1000 |
commit | 21b45b2d16bb25d79787e195e690680c005c7d4c (patch) | |
tree | 2e832e9f8f70d8e10d36915a02777a184f42b614 /MAINTAINERS | |
parent | 814fa751387e1eda9b6df9975c2592fb3c105233 (diff) | |
parent | 0178a7a54d408d2c5b7bbe7eee9450bffbec0989 (diff) |
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/Kconfig
drivers/Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 646ffe154251..3949dff927d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7843,6 +7843,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> |