Merge remote-tracking branch 'thermal/next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c91e3b7aafa95034f09ba4ef623e91e550fa512..9244548c8f8eb78b015b8ac9edb9ab998f1085e0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1498,6 +1498,14 @@ L:       linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/platform/s5p-tv/
 
+ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
+M:     Andrzej Pietrasiewicz <andrzej.p@samsung.com>
+M:     Jacek Anaszewski <j.anaszewski@samsung.com>
+L:     linux-arm-kernel@lists.infradead.org
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/platform/s5p-jpeg/
+
 ARM/SHMOBILE ARM ARCHITECTURE
 M:     Simon Horman <horms@verge.net.au>
 M:     Magnus Damm <magnus.damm@gmail.com>