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

Commit cdbb92b3 authored Oct 09, 2008 by Ingo Molnar

Merge branch 'linus' into core/rcu

parents 2ec2b482 69849375

Documentation/HOWTO

+2 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,8 @@ documentation files are also added which explain how to use the feature.
		When a kernel change causes the interface that the kernel exposes to
		userspace to change, it is recommended that you send the information or
		a patch to the manual pages explaining the change to the manual pages
		maintainer at mtk.manpages@gmail.com.
		maintainer at mtk.manpages@gmail.com, and CC the list
		linux-api@vger.kernel.org.

		Here is a list of files that are in the kernel source tree that are
		required reading:

Documentation/SubmitChecklist

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ kernel patches.

		19: All new userspace interfaces are documented in Documentation/ABI/.
		See Documentation/ABI/README for more information.
		Patches that change userspace interfaces should be CCed to
		linux-api@vger.kernel.org.

		20: Check that it all passes `make headers_check'.

Documentation/video4linux/CARDLIST.em28xx

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		45 -> Pinnacle PCTV DVB-T (em2870)
		46 -> Compro, VideoMate U3 (em2870) [185b:2870]
		47 -> KWorld DVB-T 305U (em2880) [eb1a:e305]
		48 -> KWorld DVB-T 310U (em2880)
		48 -> KWorld DVB-T 310U (em2880) [eb1a:e310]
		49 -> MSI DigiVox A/D (em2880) [eb1a:e310]
		50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
		51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]

Documentation/video4linux/gspca.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ pac7311 093a:260f SnakeCam
		pac7311 093a:2621 PAC731x
		pac7311 093a:2624 PAC7302
		pac7311 093a:2626 Labtec 2200
		pac7311 093a:262a Webcam 300k
		zc3xx 0ac8:0302 Z-star Vimicro zc0302
		vc032x 0ac8:0321 Vimicro generic vc0321
		vc032x 0ac8:0323 Vimicro Vc0323

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -1198,9 +1198,7 @@ M: hpa@zytor.com
		S: Maintained

		CPUSETS
		P: Paul Jackson
		P: Paul Menage
		M: pj@sgi.com
		M: menage@google.com
		L: linux-kernel@vger.kernel.org
		W: http://www.bullopensource.org/cpuset/
		@@ -2706,6 +2704,7 @@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
		P: Michael Kerrisk
		M: mtk.manpages@gmail.com
		W: http://www.kernel.org/doc/man-pages
		L: linux-man@vger.kernel.org
		S: Supported

		MARVELL LIBERTAS WIRELESS DRIVER