Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (f838bad1) · Commits · jan.koester / Linux

.gitignore

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,3 +53,5 @@ cscope.*

	*.orig		*.orig
	*.rej		*.rej
			*~
			\#*#

Documentation/00-INDEX

+2 −26

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/
	@@ -183,8 +177,6 @@ i386/
	- directory with info about Linux on Intel 32 bit architecture.		- directory with info about Linux on Intel 32 bit architecture.
	ia64/		ia64/
	- directory with info about Linux on Intel 64 bit architecture.		- directory with info about Linux on Intel 64 bit architecture.
	ide.txt
	- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
	infiniband/		infiniband/
	- directory with documents concerning Linux InfiniBand support.		- directory with documents concerning Linux InfiniBand support.
	initrd.txt		initrd.txt
	@@ -227,8 +219,6 @@ kprobes.txt
	- documents the kernel probes debugging feature.		- documents the kernel probes debugging feature.
	kref.txt		kref.txt
	- docs on adding reference counters (krefs) to kernel objects.		- docs on adding reference counters (krefs) to kernel objects.
	laptop-mode.txt
	- how to conserve battery power using laptop-mode.
	laptops/		laptops/
	- directory with laptop related info and laptop driver documentation.		- directory with laptop related info and laptop driver documentation.
	ldm.txt		ldm.txt
	@@ -275,8 +265,6 @@ netlabel/
	- directory with information on the NetLabel subsystem.		- directory with information on the NetLabel subsystem.
	networking/		networking/
	- directory with info on various aspects of networking with Linux.		- directory with info on various aspects of networking with Linux.
	nfsroot.txt
	- short guide on setting up a diskless box with NFS root filesystem.
	nmi_watchdog.txt		nmi_watchdog.txt
	- info on NMI watchdog for SMP systems.		- info on NMI watchdog for SMP systems.
	nommu-mmap.txt		nommu-mmap.txt
	@@ -293,22 +281,12 @@ 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
	- documentation on lightweight PI-futexes.		- documentation on lightweight PI-futexes.
	pm.txt
	- info on Linux power management support.
	pnp.txt		pnp.txt
	- Linux Plug and Play documentation.		- Linux Plug and Play documentation.
	power_supply_class.txt
	- Tells userspace about battery, UPS, AC or DC power supply properties
	power/		power/
	- directory with info on Linux PCI power management.		- directory with info on Linux PCI power management.
	powerpc/		powerpc/
	@@ -329,8 +307,6 @@ robust-futexes.txt
	- a description of what robust futexes are.		- a description of what robust futexes are.
	rocket.txt		rocket.txt
	- info on the Comtrol RocketPort multiport serial driver.		- info on the Comtrol RocketPort multiport serial driver.
	rpc-cache.txt
	- introduction to the caching mechanisms in the sunrpc layer.
	rt-mutex-design.txt		rt-mutex-design.txt
	- description of the RealTime mutex implementation design.		- description of the RealTime mutex implementation design.
	rt-mutex.txt		rt-mutex.txt

Documentation/ABI/obsolete/o2cb

0 → 100644

+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.

Documentation/ABI/stable/o2cb

0 → 100644

+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.

Documentation/ABI/testing/sysfs-bus-pci

0 → 100644

+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.