Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 99a0e513cd7ccb9a7cc77318fcebc6fecaf2a9fd..efd2ef2c266073d39e8611a1bd6e5dbd38646f41 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5434,6 +5434,12 @@ F:       drivers/uwb/*
 F:     include/linux/uwb.h
 F:     include/linux/uwb/
 
+UNIFDEF
+M:     Tony Finch <dot@dotat.at>
+W:     http://dotat.at/prog/unifdef
+S:     Maintained
+F:     scripts/unifdef.c
+
 UNIFORM CDROM DRIVER
 M:     Jens Axboe <axboe@kernel.dk>
 W:     http://www.kernel.dk
@@ -6000,9 +6006,9 @@ F:        sound/soc/codecs/wm8350.*
 F:     sound/soc/codecs/wm8400.*
 
 X.25 NETWORK LAYER
-M:     Henner Eisen <eis@baty.hanse.de>
+M:     Andrew Hendry <andrew.hendry@gmail.com>
 L:     linux-x25@vger.kernel.org
-S:     Maintained
+S:     Odd Fixes
 F:     Documentation/networking/x25*
 F:     include/net/x25*
 F:     net/x25/