Update from upstream with manual merge of Yasunori Goto's (9cec58dc) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		#
		# NOTE! Don't add files that are generated in specific
		# subdirectories here. Add them in the ".gitignore" file
		# in that subdirectory instead.
		#
		# Normal rules
		#
		.*
		*.o
		*.a
		*.s
		*.ko
		*.mod.c

		#
		# Top-level generic files
		#
		vmlinux*
		System.map
		Module.symvers

		#
		# Generated include files
		#
		include/asm
		include/config
		include/linux/autoconf.h
		include/linux/compile.h
		include/linux/version.h

+14 −12

Original line number	Diff line number	Diff line
		@@ -2211,6 +2211,15 @@ D: OV511 driver
		S: (address available on request)
		S: USA

		N: Ian McDonald
		E: iam4@cs.waikato.ac.nz
		E: imcdnzl@gmail.com
		W: http://wand.net.nz/~iam4
		W: http://imcdnzl.blogspot.com
		D: DCCP, CCID3
		S: Hamilton
		S: New Zealand

		N: Patrick McHardy
		E: kaber@trash.net
		P: 1024D/12155E80 B128 7DE6 FF0A C2B2 48BE AB4C C9D4 964E 1215 5E80
		@@ -2246,19 +2255,12 @@ S: D-90453 Nuernberg
		S: Germany

		N: Arnaldo Carvalho de Melo
		E: acme@conectiva.com.br
		E: acme@kernel.org
		E: acme@gnu.org
		W: http://bazar2.conectiva.com.br/~acme
		W: http://advogato.org/person/acme
		E: acme@mandriva.com
		E: acme@ghostprotocols.net
		W: http://oops.ghostprotocols.net:81/blog/
		P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
		D: wanrouter hacking
		D: misc Makefile, Config.in, drivers and network stacks fixes
		D: IPX & LLC network stacks maintainer
		D: Cyclom 2X synchronous card driver
		D: wl3501 PCMCIA wireless card driver
		D: i18n for minicom, net-tools, util-linux, fetchmail, etc
		S: Conectiva S.A.
		D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
		S: Mandriva
		S: R. Tocantins, 89 - Cristo Rei
		S: 80050-430 - Curitiba - Paran
		S: Brazil

+10 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,12 @@ udev
		udev is a userspace application for populating /dev dynamically with
		only entries for devices actually present. udev replaces devfs.

		FUSE
		----

		Needs libfuse 2.4.0 or later. Absolute minimum is 2.3.0 but mount
		options 'direct_io' and 'kernel_cache' won't work.

		Networking
		==========

		@@ -390,6 +396,10 @@ udev
		----
		o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

		FUSE
		----
		o <http://sourceforge.net/projects/fuse>

		Networking
		**********

+20 −1

Original line number	Diff line number	Diff line
		@@ -410,7 +410,26 @@ Kernel messages do not have to be terminated with a period.
		Printing numbers in parentheses (%d) adds no value and should be avoided.


		Chapter 13: References
		Chapter 13: Allocating memory

		The kernel provides the following general purpose memory allocators:
		kmalloc(), kzalloc(), kcalloc(), and vmalloc(). Please refer to the API
		documentation for further information about them.

		The preferred form for passing a size of a struct is the following:

		p = kmalloc(sizeof(*p), ...);

		The alternative form where struct name is spelled out hurts readability and
		introduces an opportunity for a bug when the pointer variable type is changed
		but the corresponding sizeof that is passed to a memory allocator is not.

		Casting the return value which is a void pointer is redundant. The conversion
		from void pointer to any other pointer type is guaranteed by the C programming
		language.


		Chapter 14: References

		The C Programming Language, Second Edition
		by Brian W. Kernighan and Dennis M. Ritchie.

+1 −1

Original line number	Diff line number	Diff line
		@@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = {
		</listitem>
		<listitem>
		<para>
		Function names as strings (__func__).
		Function names as strings (__FUNCTION__).
		</para>
		</listitem>
		<listitem>