Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
MAINTAINERS
between commit:
c36a483d8007 ("watchdog: Add watchdog timer support for the WinSystems EBC-C384")
from the watchdog tree and commit:
9c26df9b27b6 ("gpio: Add GPIO support for the WinSystems WS16C48")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index e3bb7755763a,6ec2be8ff68d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11972,12 -11870,12 +11982,18 @@@ M: David Härdeman <david@xxxxxxxxxxx
S: Maintained
F: drivers/media/rc/winbond-cir.c
+WINSYSTEMS EBC-C384 WATCHDOG DRIVER
+M: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
+L: linux-watchdog@xxxxxxxxxxxxxxx
+S: Maintained
+F: drivers/watchdog/ebc-c384_wdt.c
+
+ WINSYSTEMS WS16C48 GPIO DRIVER
+ M: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
+ L: linux-gpio@xxxxxxxxxxxxxxx
+ S: Maintained
+ F: drivers/gpio/gpio-ws16c48.c
+
WIMAX STACK
M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@xxxxxxxxx>
M: linux-wimax@xxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
