Merge commit 'v2.6.36' into kbuild/misc (b74b953b) · Commits · jan.koester / Linux

.gitignore

+12 −7

Original line number	Original line	Diff line number	Diff line
	@@ -35,13 +35,18 @@ modules.builtin
	#		#
	# Top-level generic files		# Top-level generic files
	#		#
	tags		/tags
	TAGS		/TAGS
	vmlinux		/linux
	vmlinuz		/vmlinux
	System.map		/vmlinuz
	Module.markers		/System.map
	Module.symvers		/Module.markers
			/Module.symvers

			#
			# git files that we don't want to ignore even it they are dot-files
			#
	!.gitignore		!.gitignore
	!.mailmap		!.mailmap

CREDITS

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3554,12 +3554,12 @@ E: cvance@nai.com
	D: portions of the Linux Security Module (LSM) framework and security modules		D: portions of the Linux Security Module (LSM) framework and security modules

	N: Petr Vandrovec		N: Petr Vandrovec
	E: vandrove@vc.cvut.cz		E: petr@vandrovec.name
	D: Small contributions to ncpfs		D: Small contributions to ncpfs
	D: Matrox framebuffer driver		D: Matrox framebuffer driver
	S: Chudenicka 8		S: 21513 Conradia Ct
	S: 10200 Prague 10, Hostivar		S: Cupertino, CA 95014
	S: Czech Republic		S: USA

	N: Thibaut Varene		N: Thibaut Varene
	E: T-Bone@parisc-linux.org		E: T-Bone@parisc-linux.org

Documentation/00-INDEX

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,6 @@ DocBook/
	- directory with DocBook templates etc. for kernel documentation.		- directory with DocBook templates etc. for kernel documentation.
	HOWTO		HOWTO
	- the process and procedures of how to do Linux kernel development.		- the process and procedures of how to do Linux kernel development.
	IO-mapping.txt
	- how to access I/O mapped memory from within device drivers.
	IPMI.txt		IPMI.txt
	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.		- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
	IRQ-affinity.txt		IRQ-affinity.txt
	@@ -84,6 +82,8 @@ blockdev/
	- info on block devices & drivers		- info on block devices & drivers
	btmrvl.txt		btmrvl.txt
	- info on Marvell Bluetooth driver usage.		- info on Marvell Bluetooth driver usage.
			bus-virt-phys-mapping.txt
			- how to access I/O mapped memory from within device drivers.
	cachetlb.txt		cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.		- describes the cache/TLB flushing interfaces Linux uses.
	cdrom/		cdrom/
	@@ -130,8 +130,6 @@ edac.txt
	- information on EDAC - Error Detection And Correction		- information on EDAC - Error Detection And Correction
	eisa.txt		eisa.txt
	- info on EISA bus support.		- info on EISA bus support.
	exception.txt
	- how Linux v2.2 handles exceptions without verify_area etc.
	fault-injection/		fault-injection/
	- dir with docs about the fault injection capabilities infrastructure.		- dir with docs about the fault injection capabilities infrastructure.
	fb/		fb/
	@@ -168,6 +166,8 @@ initrd.txt
	- how to use the RAM disk as an initial/temporary root filesystem.		- how to use the RAM disk as an initial/temporary root filesystem.
	input/		input/
	- info on Linux input device support.		- info on Linux input device support.
			io-mapping.txt
			- description of io_mapping functions in linux/io-mapping.h
	io_ordering.txt		io_ordering.txt
	- info on ordering I/O writes to memory-mapped addresses.		- info on ordering I/O writes to memory-mapped addresses.
	ioctl/		ioctl/
	@@ -232,6 +232,8 @@ memory.txt
	- info on typical Linux memory problems.		- info on typical Linux memory problems.
	mips/		mips/
	- directory with info about Linux on MIPS architecture.		- directory with info about Linux on MIPS architecture.
			mmc/
			- directory with info about the MMC subsystem
	mono.txt		mono.txt
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.		- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
	mutex-design.txt		mutex-design.txt
	@@ -250,6 +252,8 @@ numastat.txt
	- info on how to read Numa policy hit/miss statistics in sysfs.		- info on how to read Numa policy hit/miss statistics in sysfs.
	oops-tracing.txt		oops-tracing.txt
	- how to decode those nasty internal kernel error dump messages.		- how to decode those nasty internal kernel error dump messages.
			padata.txt
			- An introduction to the "padata" parallel execution API
	parisc/		parisc/
	- directory with info on using Linux on PA-RISC architecture.		- directory with info on using Linux on PA-RISC architecture.
	parport.txt		parport.txt

Documentation/ABI/obsolete/sysfs-bus-usb

0 → 100644

+31 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/usb/devices/.../power/level
			Date: March 2007
			KernelVersion: 2.6.21
			Contact: Alan Stern <stern@rowland.harvard.edu>
			Description:
			Each USB device directory will contain a file named
			power/level. This file holds a power-level setting for
			the device, either "on" or "auto".

			"on" means that the device is not allowed to autosuspend,
			although normal suspends for system sleep will still
			be honored. "auto" means the device will autosuspend
			and autoresume in the usual manner, according to the
			capabilities of its driver.

			During normal use, devices should be left in the "auto"
			level. The "on" level is meant for administrative uses.
			If you want to suspend a device immediately but leave it
			free to wake up in response to I/O requests, you should
			write "0" to power/autosuspend.

			Device not capable of proper suspend and resume should be
			left in the "on" level. Although the USB spec requires
			devices to support suspend/resume, many of them do not.
			In fact so many don't that by default, the USB core
			initializes all non-hub devices in the "on" level. Some
			drivers may change this setting when they are bound.

			This file is deprecated and will be removed after 2010.
			Use the power/control file instead; it does exactly the
			same thing.

Documentation/ABI/obsolete/sysfs-class-rfkill

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			rfkill - radio frequency (RF) connector kill switch support

			For details to this subsystem look at Documentation/rfkill.txt.

			What: /sys/class/rfkill/rfkill[0-9]+/state
			Date: 09-Jul-2007
			KernelVersion v2.6.22
			Contact: linux-wireless@vger.kernel.org
			Description: Current state of the transmitter.
			This file is deprecated and sheduled to be removed in 2014,
			because its not possible to express the 'soft and hard block'
			state of the rfkill driver.
			Values: A numeric value.
			0: RFKILL_STATE_SOFT_BLOCKED
			transmitter is turned off by software
			1: RFKILL_STATE_UNBLOCKED
			transmitter is (potentially) active
			2: RFKILL_STATE_HARD_BLOCKED
			transmitter is forced off by something outside of
			the driver's control.

			What: /sys/class/rfkill/rfkill[0-9]+/claim
			Date: 09-Jul-2007
			KernelVersion v2.6.22
			Contact: linux-wireless@vger.kernel.org
			Description: This file is deprecated because there no longer is a way to
			claim just control over a single rfkill instance.
			This file is scheduled to be removed in 2012.
			Values: 0: Kernel handles events