lwmon5: fix manual merge error in POST

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d1782b4..58f833c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -408,6 +408,10 @@ John Zhan <zhanz@sinovee.com>
 
        svm_sc8xx               MPC8xx
 
+Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+
+       linkstation             MPC8241
+
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards: