Hi Mike,
Today's linux-next merge of the clk tree got a conflict in MAINTAINERS
between commit 7d459937dc09 ("[media] Add driver for Samsung S5K5BAF
camera sensor") from the v4l-dvb tree and commit 310e39c9b320
("MAINTAINERS: Add entry for Samsung SoC clock drivers") from the clk
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc MAINTAINERS
index 0188725a5658,273311e10b5b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7460,13 -7334,12 +7468,19 @@@ L: linux-media@xxxxxxxxxxxxxx
S: Supported
F: drivers/media/i2c/s5c73m3/*
+SAMSUNG S5K5BAF CAMERA DRIVER
+M: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
+M: Andrzej Hajda <a.hajda@xxxxxxxxxxx>
+L: linux-media@xxxxxxxxxxxxxxx
+S: Supported
+F: drivers/media/i2c/s5k5baf.c
+
+ SAMSUNG SOC CLOCK DRIVERS
+ M: Tomasz Figa <t.figa@xxxxxxxxxxx>
+ S: Supported
+ L: linux-samsung-soc@xxxxxxxxxxxxxxx (moderated for non-subscribers)
+ F: drivers/clk/samsung/
+
SERIAL DRIVERS
M: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
L: linux-serial@xxxxxxxxxxxxxxx
Attachment:
pgp67D7bVcBXY.pgp
Description: PGP signature
