Merge tag 'samsung-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...
authorArnd Bergmann <arnd@arndb.de>
Fri, 13 Nov 2020 12:16:00 +0000 (13:16 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 13 Nov 2020 12:16:27 +0000 (13:16 +0100)
Samsung changes for v5.10

Remove Kamil Debski, Kyungmin Park and Jeongtae Park from maintainers of
several drivers.  There were no maintenance activities from them for
some time.  While at touching credits, this also cleans up white spaces.

* tag 'samsung-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  CREDITS: remove trailing white spaces
  MAINTAINERS: remove Jeongtae Park from Samsung MFC entry
  MAINTAINERS: move Kyungmin Park to credits
  MAINTAINERS: move Kamil Debski to credits

Link: https://lore.kernel.org/r/20201031120237.8542-1-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
CREDITS
MAINTAINERS

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
index 3da6d8c154e486f4b9eb43b574b580ac43ecf1ea,40b4a582b4ccb5835738a3db9212835bd9323e0e..e7e9225c62394fd00fb8de8535e5194399963483
@@@ -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@kernel.org>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org