Merge branch 'linus' into locking/urgent, to pick up fixes (a2071cd7) · Commits · e / devices / android_kernel_teracube_emerald

.cocciconfig

0 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line
			[spatch]
			options = --timeout 200
			options = --use-gitgrep

.gitignore

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ modules.builtin
	Module.symvers		Module.symvers
	*.dwo		*.dwo
	*.su		*.su
			.c.[012].*

	#		#
	# Top-level generic files		# Top-level generic files
	@@ -66,6 +67,7 @@ Module.symvers
	#		#
	!.gitignore		!.gitignore
	!.mailmap		!.mailmap
			!.cocciconfig

	#		#
	# Generated include files		# Generated include files

.mailmap

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -92,9 +92,17 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
	Leonid I Ananiev <leonid.i.ananiev@intel.com>		Leonid I Ananiev <leonid.i.ananiev@intel.com>
	Linas Vepstas <linas@austin.ibm.com>		Linas Vepstas <linas@austin.ibm.com>
			Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
			Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	Matthieu CASTET <castet.matthieu@free.fr>		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>		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
			Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
			Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
			Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
			Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
			Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
			Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
	Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
	Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
	Mayuresh Janorkar <mayur@ti.com>		Mayuresh Janorkar <mayur@ti.com>
	@@ -130,7 +138,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
	Sascha Hauer <s.hauer@pengutronix.de>		Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
	Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
	Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
			Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
			Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
			Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>

Documentation/.gitignore

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			output
			*.pyc

Documentation/00-INDEX

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -255,10 +255,10 @@ kbuild/
	- directory with info about the kernel build process.		- directory with info about the kernel build process.
	kdump/		kdump/
	- directory with mini HowTo on getting the crash dump code to work.		- directory with mini HowTo on getting the crash dump code to work.
	kernel-doc-nano-HOWTO.txt
	- mini HowTo on generation and location of kernel documentation files.
	kernel-docs.txt		kernel-docs.txt
	- listing of various WWW + books that document kernel internals.		- listing of various WWW + books that document kernel internals.
			kernel-documentation.rst
			- how to write and format reStructuredText kernel documentation
	kernel-parameters.txt		kernel-parameters.txt
	- summary listing of command line / boot prompt args for the kernel.		- summary listing of command line / boot prompt args for the kernel.
	kernel-per-CPU-kthreads.txt		kernel-per-CPU-kthreads.txt