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

Commit 36d99df2 authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 076d8423 3dc50637
Loading
Loading
Loading
Loading
+2 −14
Original line number Original line Diff line number Diff line
@@ -25,8 +25,6 @@ DMA-API.txt
	- DMA API, pci_ API & extensions for non-consistent memory machines.
	- DMA API, pci_ API & extensions for non-consistent memory machines.
DMA-ISA-LPC.txt
DMA-ISA-LPC.txt
	- How to do DMA with ISA (and LPC) devices.
	- How to do DMA with ISA (and LPC) devices.
DMA-mapping.txt
	- info for PCI drivers using DMA portably across all platforms.
DocBook/
DocBook/
	- directory with DocBook templates etc. for kernel documentation.
	- directory with DocBook templates etc. for kernel documentation.
HOWTO
HOWTO
@@ -43,8 +41,6 @@ ManagementStyle
	- how to (attempt to) manage kernel hackers.
	- how to (attempt to) manage kernel hackers.
MSI-HOWTO.txt
MSI-HOWTO.txt
	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
PCIEBUS-HOWTO.txt
	- a guide describing the PCI Express Port Bus driver.
RCU/
RCU/
	- directory with info on RCU (read-copy update).
	- directory with info on RCU (read-copy update).
README.DAC960
README.DAC960
@@ -167,10 +163,8 @@ highuid.txt
	- notes on the change from 16 bit to 32 bit user/group IDs.
	- notes on the change from 16 bit to 32 bit user/group IDs.
hpet.txt
hpet.txt
	- High Precision Event Timer Driver for Linux.
	- High Precision Event Timer Driver for Linux.
hrtimer/
timers/
	- info on the timer_stats debugging facility for timer (ab)use.
	- info on the timer related topics
hrtimers/
	- info on the hrtimers subsystem for high-resolution kernel timers.
hw_random.txt
hw_random.txt
	- info on Linux support for random number generator in i8xx chipsets.
	- info on Linux support for random number generator in i8xx chipsets.
hwmon/
hwmon/
@@ -287,12 +281,6 @@ parport.txt
	- how to use the parallel-port driver.
	- how to use the parallel-port driver.
parport-lowlevel.txt
parport-lowlevel.txt
	- description and usage of the low level parallel port functions.
	- description and usage of the low level parallel port functions.
pci-error-recovery.txt
	- info on PCI error recovery.
pci.txt
	- info on the PCI subsystem for device driver authors.
pcieaer-howto.txt
	- the PCI Express Advanced Error Reporting Driver Guide HOWTO.
pcmcia/
pcmcia/
	- info on the Linux PCMCIA driver.
	- info on the Linux PCMCIA driver.
pi-futex.txt
pi-futex.txt
+11 −0
Original line number Original line Diff line number Diff line
What:		/sys/o2cb symlink
Date:		Dec 2005
KernelVersion:	2.6.16
Contact:	ocfs2-devel@oss.oracle.com
Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will
		be removed when new versions of ocfs2-tools which know to look
		in /sys/fs/o2cb are sufficiently prevalent. Don't code new
		software to look here, it should try /sys/fs/o2cb instead.
		See Documentation/ABI/stable/o2cb for more information on usage.
Users:		ocfs2-tools. It's sufficient to mail proposed changes to
		ocfs2-devel@oss.oracle.com.
+10 −0
Original line number Original line Diff line number Diff line
What:		/sys/fs/o2cb/ (was /sys/o2cb)
Date:		Dec 2005
KernelVersion:	2.6.16
Contact:	ocfs2-devel@oss.oracle.com
Description:	Ocfs2-tools looks at 'interface-revision' for versioning
		information. Each logmask/ file controls a set of debug prints
		and can be written into with the strings "allow", "deny", or
		"off". Reading the file returns the current state.
Users:		ocfs2-tools. It's sufficient to mail proposed changes to
		ocfs2-devel@oss.oracle.com.
+11 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/pci/devices/.../vpd
Date:		February 2008
Contact:	Ben Hutchings <bhutchings@solarflare.com>
Description:
		A file named vpd in a device directory will be a
		binary file containing the Vital Product Data for the
		device.  It should follow the VPD format defined in
		PCI Specification 2.1 or 2.2, but users should consider
		that some devices may have malformatted data.  If the
		underlying VPD has a writable section then the
		corresponding section of this file will be writable.
+23 −0
Original line number Original line Diff line number Diff line
What:		/sys/firmware/ibft/initiator
Date:		November 2007
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>
Description:	The /sys/firmware/ibft/initiator directory will contain
		files that expose the iSCSI Boot Firmware Table initiator data.
		Usually this contains the Initiator name.

What:		/sys/firmware/ibft/targetX
Date:		November 2007
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>
Description:	The /sys/firmware/ibft/targetX directory will contain
		files that expose the iSCSI Boot Firmware Table target data.
		Usually this contains the target's IP address, boot LUN,
		target name, and what NIC it is associated with. It can also
		contain the CHAP name (and password), the reverse CHAP
		name (and password)

What:		/sys/firmware/ibft/ethernetX
Date:		November 2007
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>
Description:	The /sys/firmware/ibft/ethernetX directory will contain
		files that expose the iSCSI Boot Firmware Table NIC data.
		This can this can the IP address, MAC, and gateway of the NIC.
Loading