Merge branch 'merge' into next (435462c6) · Commits · 戴 / test

Documentation/filesystems/tmpfs.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,4 +133,4 @@ RAM/SWAP in 10240 inodes and it is only accessible by root.
		Author:
		Christoph Rohland <cr@sap.com>, 1.12.01
		Updated:
		Hugh Dickins <hugh@veritas.com>, 4 June 2007
		Hugh Dickins, 4 June 2007

Documentation/kernel-parameters.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1542,6 +1542,10 @@ and is between 256 and 4096 characters. It is defined in the file
		register save and restore. The kernel will only save
		legacy floating-point registers on task switch.

		noxsave [BUGS=X86] Disables x86 extended register state save
		and restore using xsave. The kernel will fallback to
		enabling legacy floating-point and sse state.

		nohlt [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
		wfi(ARM) instruction doesn't work correctly and not to
		use it. This is also useful when using JTAG debugger.

Documentation/networking/ip-sysctl.txt

+12 −3

Original line number	Diff line number	Diff line
		@@ -1266,13 +1266,22 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max
		sctp_wmem - vector of 3 INTEGERs: min, default, max
		See tcp_wmem for a description.

		UNDOCUMENTED:

		/proc/sys/net/core/*
		dev_weight FIXME
		dev_weight - INTEGER
		The maximum number of packets that kernel can handle on a NAPI
		interrupt, it's a Per-CPU variable.

		Default: 64

		/proc/sys/net/unix/*
		max_dgram_qlen FIXME
		max_dgram_qlen - INTEGER
		The maximum length of dgram socket receive queue

		Default: 10


		UNDOCUMENTED:

		/proc/sys/net/irda/*
		fast_poll_increase FIXME

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,7 @@ STAC9227/9228/9229/927x
		ref-no-jd Reference board without HP/Mic jack detection
		3stack D965 3stack
		5stack D965 5stack + SPDIF
		5stack-no-fp D965 5stack without front panel
		dell-3stack Dell Dimension E520
		dell-bios Fixes with Dell BIOS setup
		auto BIOS setup (default)

MAINTAINERS

+25 −9

Original line number	Diff line number	Diff line
		@@ -1132,17 +1132,17 @@ F: fs/bfs/
		F: include/linux/bfs_fs.h

		BLACKFIN ARCHITECTURE
		P: Bryan Wu
		M: cooloney@kernel.org
		P: Mike Frysinger
		M: vapier@gentoo.org
		L: uclinux-dist-devel@blackfin.uclinux.org
		W: http://blackfin.uclinux.org
		S: Supported
		F: arch/blackfin/

		BLACKFIN EMAC DRIVER
		P: Bryan Wu
		M: cooloney@kernel.org
		L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
		P: Michael Hennerich
		M: michael.hennerich@analog.com
		L: uclinux-dist-devel@blackfin.uclinux.org
		W: http://blackfin.uclinux.org
		S: Supported
		F: drivers/net/bfin_mac.*
		@@ -1150,7 +1150,7 @@ F: drivers/net/bfin_mac.*
		BLACKFIN RTC DRIVER
		P: Mike Frysinger
		M: vapier.adi@gmail.com
		L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
		L: uclinux-dist-devel@blackfin.uclinux.org
		W: http://blackfin.uclinux.org
		S: Supported
		F: drivers/rtc/rtc-bfin.c
		@@ -1158,7 +1158,7 @@ F: drivers/rtc/rtc-bfin.c
		BLACKFIN SERIAL DRIVER
		P: Sonic Zhang
		M: sonic.zhang@analog.com
		L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
		L: uclinux-dist-devel@blackfin.uclinux.org
		W: http://blackfin.uclinux.org
		S: Supported
		F: drivers/serial/bfin_5xx.c
		@@ -1166,7 +1166,7 @@ F: drivers/serial/bfin_5xx.c
		BLACKFIN WATCHDOG DRIVER
		P: Mike Frysinger
		M: vapier.adi@gmail.com
		L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
		L: uclinux-dist-devel@blackfin.uclinux.org
		W: http://blackfin.uclinux.org
		S: Supported
		F: drivers/watchdog/bfin_wdt.c
		@@ -1174,7 +1174,7 @@ F: drivers/watchdog/bfin_wdt.c
		BLACKFIN I2C TWI DRIVER
		P: Sonic Zhang
		M: sonic.zhang@analog.com
		L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
		L: uclinux-dist-devel@blackfin.uclinux.org
		W: http://blackfin.uclinux.org/
		S: Supported
		F: drivers/i2c/busses/i2c-bfin-twi.c
		@@ -1431,6 +1431,14 @@ P: Russell King
		M: linux@arm.linux.org.uk
		F: include/linux/clk.h

		CISCO FCOE HBA DRIVER
		P: Abhijeet Joglekar
		M: abjoglek@cisco.com
		P: Joe Eykholt
		M: jeykholt@cisco.com
		L: linux-scsi@vger.kernel.org
		S: Supported

		CODA FILE SYSTEM
		P: Jan Harkes
		M: jaharkes@cs.cmu.edu
		@@ -5579,6 +5587,14 @@ M: ian@mnementh.co.uk
		S: Maintained
		F: drivers/mmc/host/tmio_mmc.*

		TMPFS (SHMEM FILESYSTEM)
		P: Hugh Dickins
		M: hugh.dickins@tiscali.co.uk
		L: linux-mm@kvack.org
		S: Maintained
		F: include/linux/shmem_fs.h
		F: mm/shmem.c

		TPM DEVICE DRIVER
		P: Debora Velarde
		M: debora@linux.vnet.ibm.com

Admin message