Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fea883f authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

parents 17fbd493 e8aab86f

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ D: Configure, Menuconfig, xconfig 


N: Mauro Carvalho Chehab

E: m.chehab@samsung.org

E: mchehab@osg.samsung.com

E: mchehab@infradead.org

D: Media subsystem (V4L/DVB) drivers and core

D: EDAC drivers and EDAC 3.0 core rework

Documentation/module-signing.txt

+6 −0
Original line number Diff line number Diff line
@@ -239,3 +239,9 @@ Since the private key is used to sign modules, viruses and malware could use 
the private key to sign modules and compromise the operating system.  The

private key must be either destroyed or moved to a secure location and not kept

in the root node of the kernel source tree.



If you use the same private key to sign modules for multiple kernel

configurations, you must ensure that the module version information is

sufficient to prevent loading a module into a different kernel.  Either

set CONFIG_MODVERSIONS=y or ensure that each configuration has a different

kernel release string by changing EXTRAVERSION or CONFIG_LOCALVERSION.

MAINTAINERS

+34 −17
Original line number Diff line number Diff line
@@ -1836,7 +1836,8 @@ F: include/net/ax25.h 
F:	net/ax25/



AZ6007 DVB DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -2206,7 +2207,8 @@ F: Documentation/filesystems/btrfs.txt 
F:	fs/btrfs/



BTTV VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -2727,7 +2729,8 @@ F: drivers/media/common/cx2341x* 
F:	include/media/cx2341x*



CX88 VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -3410,7 +3413,8 @@ F: fs/ecryptfs/ 
EDAC-CORE

M:	Doug Thompson <dougthompson@xmission.com>

M:	Borislav Petkov <bp@alien8.de>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Supported
@@ -3459,7 +3463,8 @@ S: Maintained 
F:	drivers/edac/e7xxx_edac.c



EDAC-GHES

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained
@@ -3487,21 +3492,24 @@ S: Maintained 
F:	drivers/edac/i5000_edac.c



EDAC-I5400

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i5400_edac.c



EDAC-I7300

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i7300_edac.c



EDAC-I7CORE

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained
@@ -3544,7 +3552,8 @@ S: Maintained 
F:	drivers/edac/r82600_edac.c



EDAC-SBRIDGE

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained
@@ -3604,7 +3613,8 @@ S: Maintained 
F:	drivers/net/ethernet/ibm/ehea/



EM28XX VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -5970,7 +5980,8 @@ S: Maintained 
F:	drivers/media/radio/radio-maxiradio*



MEDIA INPUT INFRASTRUCTURE (V4L/DVB)

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

P:	LinuxTV.org Project

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org
@@ -8029,7 +8040,8 @@ S: Odd Fixes 
F:	drivers/media/i2c/saa6588*



SAA7134 VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -8487,7 +8499,8 @@ S: Maintained 
F:	drivers/media/radio/si4713/radio-usb-si4713.c



SIANO DVB DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -9176,7 +9189,8 @@ S: Maintained 
F:	drivers/media/i2c/tda9840*



TEA5761 TUNER DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -9184,7 +9198,8 @@ S: Odd fixes 
F:	drivers/media/tuners/tea5761.*



TEA5767 TUNER DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -9497,7 +9512,8 @@ F: include/linux/shmem_fs.h 
F:	mm/shmem.c



TM6000 VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -10318,7 +10334,8 @@ S: Maintained 
F:	arch/x86/kernel/cpu/mcheck/*



XC2028/3028 TUNER DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 39

SUBLEVEL = 40

EXTRAVERSION =

NAME = Shuffling Zombie Juror