linux-next: manual merge of the clk tree with the v4l-dvb tree

linux-next: manual merge of the clk tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]

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@canb.auug.org.au

diff --cc MAINTAINERS
index 0188725a5658,273311e10b5b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7460,13 -7334,12 +7468,19 @@@ L:	linux-media@vger.kernel.or
  S:	Supported
  F:	drivers/media/i2c/s5c73m3/*
  
 +SAMSUNG S5K5BAF CAMERA DRIVER
 +M:	Kyungmin Park <kyungmin.park@samsung.com>
 +M:	Andrzej Hajda <a.hajda@samsung.com>
 +L:	linux-media@vger.kernel.org
 +S:	Supported
 +F:	drivers/media/i2c/s5k5baf.c
 +
+ SAMSUNG SOC CLOCK DRIVERS
+ M:	Tomasz Figa <t.figa@samsung.com>
+ S:	Supported
+ L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+ F:	drivers/clk/samsung/
+ 
  SERIAL DRIVERS
  M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:	linux-serial@vger.kernel.org

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]