linux-next: manual merge of the samsung-krzk-fixes tree with the arm-soc-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the samsung-krzk-fixes tree got a conflict in:

  MAINTAINERS

between commit:

  421f2597bf42 ("MAINTAINERS: Move Kukjin Kim to credits")

from the arm-soc-fixes tree and commit:

  215f06d7efc2 ("MAINTAINERS: move Kyungmin Park to credits")

from the samsung-krzk-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 9bff94560b42,40b4a582b4cc..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2374,7 -2374,8 +2374,7 @@@ F:	drivers/i2c/busses/i2c-rk3x.
  F:	sound/soc/rockchip/
  N:	rockchip
  
- ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
+ ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:	Kukjin Kim <kgene@xxxxxxxxxx>
  M:	Krzysztof Kozlowski <krzk@xxxxxxxxxx>
  L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
  L:	linux-samsung-soc@xxxxxxxxxxxxxxx

Attachment: pgp8RfEXkkXa8.pgp
Description: OpenPGP digital signature