Commit 7a996d3a authored by Michal Marek's avatar Michal Marek
Browse files

Merge commit 'v2.6.35' into kbuild/kconfig 

Conflicts:
	scripts/kconfig/Makefile
parents 7cf3d73b 9fe6206f

.gitignore

+12 −7
Original line number Diff line number Diff line
@@ -35,13 +35,18 @@ modules.builtin 
#

# Top-level generic files

#

tags

TAGS

vmlinux

vmlinuz

System.map

Module.markers

Module.symvers

/tags

/TAGS

/linux

/vmlinux

/vmlinuz

/System.map

/Module.markers

/Module.symvers



#

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

#

!.gitignore

!.mailmap

Documentation/00-INDEX

+6 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ DocBook/ 
	- directory with DocBook templates etc. for kernel documentation.

HOWTO

	- 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

	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.

IRQ-affinity.txt
@@ -84,6 +82,8 @@ blockdev/ 
	- info on block devices & drivers

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

bus-virt-phys-mapping.txt

	- how to access I/O mapped memory from within device drivers.

cachetlb.txt

	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/
@@ -168,6 +168,8 @@ initrd.txt 
	- how to use the RAM disk as an initial/temporary root filesystem.

input/

	- info on Linux input device support.

io-mapping.txt

	- description of io_mapping functions in linux/io-mapping.h

io_ordering.txt

	- info on ordering I/O writes to memory-mapped addresses.

ioctl/
@@ -250,6 +252,8 @@ numastat.txt 
	- info on how to read Numa policy hit/miss statistics in sysfs.

oops-tracing.txt

	- how to decode those nasty internal kernel error dump messages.

padata.txt

	- An introduction to the "padata" parallel execution API

parisc/

	- directory with info on using Linux on PA-RISC architecture.

parport.txt

Documentation/ABI/obsolete/sysfs-bus-usb

0 → 100644
+31 −0
Original line number 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 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

Documentation/ABI/stable/sysfs-class-rfkill

0 → 100644
+67 −0
Original line number Diff line number Diff line 
rfkill - radio frequency (RF) connector kill switch support



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



For the deprecated /sys/class/rfkill/*/state and

/sys/class/rfkill/*/claim knobs of this interface look in

Documentation/ABI/obsolete/sysfs-class-rfkill.



What: 		/sys/class/rfkill

Date:		09-Jul-2007

KernelVersion:	v2.6.22

Contact:	linux-wireless@vger.kernel.org,

Description: 	The rfkill class subsystem folder.

		Each registered rfkill driver is represented by an rfkillX

		subfolder (X being an integer > 0).





What:		/sys/class/rfkill/rfkill[0-9]+/name

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Name assigned by driver to this key (interface or driver name).

Values: 	arbitrary string.





What: 		/sys/class/rfkill/rfkill[0-9]+/type

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Driver type string ("wlan", "bluetooth", etc).

Values: 	See include/linux/rfkill.h.





What:		/sys/class/rfkill/rfkill[0-9]+/persistent

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Whether the soft blocked state is initialised from non-volatile

		storage at startup.

Values: 	A numeric value.

		0: false

		1: true





What:		/sys/class/rfkill/rfkill[0-9]+/hard

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description: 	Current hardblock state. This file is read only.

Values: 	A numeric value.

		0: inactive

			The transmitter is (potentially) active.

		1: active

			The transmitter is forced off by something outside of

			the driver's control.





What:		/sys/class/rfkill/rfkill[0-9]+/soft

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description:	Current softblock state. This file is read and write.

Values: 	A numeric value.

		0: inactive

			The transmitter is (potentially) active.

		1: active

			The transmitter is turned off by software.