Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (9714d315) · Commits · jan.koester / Linux

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ modules.builtin
		*.gz
		*.bz2
		*.lzma
		*.lzo
		*.patch
		*.gcno

Documentation/.gitignore

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		filesystems/dnotify_test
		laptops/dslm
		timers/hpet_example
		vm/hugepage-mmap
		vm/hugepage-shm
		vm/map_hugetlb

Documentation/00-INDEX

+4 −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/

Documentation/ABI/testing/debugfs-ec

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/debug/ec/*/{gpe,use_global_lock,io}
		Date: July 2010
		Contact: Thomas Renninger <trenn@suse.de>
		Description:

		General information like which GPE is assigned to the EC and whether
		the global lock should get used.
		Knowing the EC GPE one can watch the amount of HW events related to
		the EC here (XY -> GPE number from /sys/kernel/debug/ec/*/gpe):
		/sys/firmware/acpi/interrupts/gpeXY

		The io file is binary and a userspace tool located here:
		ftp://ftp.suse.com/pub/people/trenn/sources/ec/
		should get used to read out the 256 Embedded Controller registers
		or writing to them.

		CAUTION: Do not write to the Embedded Controller if you don't know
		what you are doing! Rebooting afterwards also is a good idea.
		This can influence the way your machine is cooled and fans may
		not get switched on again after you did a wrong write.

Documentation/ABI/testing/sysfs-bus-pci

+0 −40

Original line number	Diff line number	Diff line
		@@ -133,46 +133,6 @@ Description:
		The symbolic link points to the PCI device sysfs entry of the
		Physical Function this device associates with.


		What: /sys/bus/pci/slots/...
		Date: April 2005 (possibly older)
		KernelVersion: 2.6.12 (possibly older)
		Contact: linux-pci@vger.kernel.org
		Description:
		When the appropriate driver is loaded, it will create a
		directory per claimed physical PCI slot in
		/sys/bus/pci/slots/. The names of these directories are
		specific to the driver, which in turn, are specific to the
		platform, but in general, should match the label on the
		machine's physical chassis.

		The drivers that can create slot directories include the
		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.

		The slot directories contain, at a minimum, a file named
		'address' which contains the PCI bus:device:function tuple.
		Other files may appear as well, but are specific to the
		driver.

		What: /sys/bus/pci/slots/.../function[0-7]
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		and the physical slot is actually populated with a device,
		symbolic links in the slot directory pointing to the
		device's PCI functions are created as well.

		What: /sys/bus/pci/devices/.../slot
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		a symbolic link pointing to the slot directory will be
		created as well.

		What: /sys/bus/pci/slots/.../module
		Date: June 2009
		Contact: linux-pci@vger.kernel.org