| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Jan 2014 16:00:01 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mike Turquette <mturquette@...aro.org>,
Mauro Carvalho Chehab <mchehab@...radead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Tomasz Figa <t.figa@...sung.com>
Subject: linux-next: manual merge of the clk tree with the v4l-dvb tree
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@...b.auug.org.au
diff --cc MAINTAINERS
index 0188725a5658,273311e10b5b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7460,13 -7334,12 +7468,19 @@@ L: linux-media@...r.kernel.or
S: Supported
F: drivers/media/i2c/s5c73m3/*
+SAMSUNG S5K5BAF CAMERA DRIVER
+M: Kyungmin Park <kyungmin.park@...sung.com>
+M: Andrzej Hajda <a.hajda@...sung.com>
+L: linux-media@...r.kernel.org
+S: Supported
+F: drivers/media/i2c/s5k5baf.c
+
+ SAMSUNG SOC CLOCK DRIVERS
+ M: Tomasz Figa <t.figa@...sung.com>
+ S: Supported
+ L: linux-samsung-soc@...r.kernel.org (moderated for non-subscribers)
+ F: drivers/clk/samsung/
+
SERIAL DRIVERS
M: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
L: linux-serial@...r.kernel.org
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists