Merge branch 'sched/urgent'; commit 'v2.6.29-rc5' into sched/core (5274f835) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/connector/cn_test.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ static void cn_test_timer_func(unsigned long __data)

		memcpy(m + 1, data, m->len);

		cn_netlink_send(m, 0, gfp_any());
		cn_netlink_send(m, 0, GFP_ATOMIC);
		kfree(m);
		}

		@@ -160,10 +160,8 @@ static int cn_test_init(void)
		goto err_out;
		}

		init_timer(&cn_test_timer);
		cn_test_timer.function = cn_test_timer_func;
		setup_timer(&cn_test_timer, cn_test_timer_func, 0);
		cn_test_timer.expires = jiffies + HZ;
		cn_test_timer.data = 0;
		add_timer(&cn_test_timer);

		return 0;

+4 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,8 @@ Only comments so marked will be considered by the kernel-doc scripts,
		and any comment so marked must be in kernel-doc format. Do not use
		"/**" to be begin a comment block unless the comment block contains
		kernel-doc formatted comments. The closing comment marker for
		kernel-doc comments can be either "/" or "*/".
		kernel-doc comments can be either "/" or "/", but "/" is
		preferred in the Linux kernel tree.

		Kernel-doc comments should be placed just before the function
		or data structure being described.
		@@ -63,7 +64,7 @@ Example kernel-doc function comment:
		* comment lines.
		*
		* The longer description can have multiple paragraphs.
		**/
		*/

		The first line, with the short description, must be on a single line.

		@@ -85,7 +86,7 @@ Example kernel-doc data structure comment.
		* perhaps with more lines and words.
		*
		* Longer description of this structure.
		**/
		*/

		The kernel-doc function comments describe each parameter to the
		function, in order, with the @name lines.

+2 −0

Original line number	Diff line number	Diff line
		@@ -937,6 +937,8 @@ and is between 256 and 4096 characters. It is defined in the file


		intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option
		on
		Enable intel iommu driver.
		off
		Disable intel iommu driver.
		igfx_off [Default Off]

+10 −2

Original line number	Diff line number	Diff line
		@@ -1202,6 +1202,8 @@ S: Supported
		CONTROL GROUPS (CGROUPS)
		P: Paul Menage
		M: menage@google.com
		P: Li Zefan
		M: lizf@cn.fujitsu.com
		L: containers@lists.linux-foundation.org
		S: Maintained

		@@ -3537,6 +3539,12 @@ S: Maintained
		PXA MMCI DRIVER
		S: Orphan

		PXA RTC DRIVER
		P: Robert Jarzmik
		M: robert.jarzmik@free.fr
		L: rtc-linux@googlegroups.com
		S: Maintained

		QLOGIC QLA2XXX FC-SCSI DRIVER
		P: Andrew Vasquez
		M: linux-driver@qlogic.com
		@@ -4285,8 +4293,8 @@ P: Rajiv Andrade
		M: srajiv@linux.vnet.ibm.com
		W: http://tpmdd.sourceforge.net
		P: Marcel Selhorst
		M: tpm@selhorst.net
		W: http://www.prosec.rub.de/tpm/
		M: m.selhorst@sirrix.com
		W: http://www.sirrix.com
		L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
		S: Maintained

+1 −1