Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772',... (96916090) · Commits · 戴 / test

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ TAGS
		vmlinux*
		!vmlinux.lds.S
		System.map
		Module.markers
		Module.symvers
		!.gitignore

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -403,6 +403,8 @@ D: Linux CD and Support Giveaway List
		N: Erik Inge Bolsø
		E: knan@mo.himolde.no
		D: Misc kernel hacks
		D: Updated PC speaker driver for 2.3
		S: Norway

		N: Andreas E. Bombe
		E: andreas.bombe@munich.netsurf.de
		@@ -3116,6 +3118,12 @@ S: Post Office Box 64132
		S: Sunnyvale, California 94088-4132
		S: USA

		N: Stas Sergeev
		E: stsp@users.sourceforge.net
		D: PCM PC-Speaker driver
		D: misc fixes
		S: Russia

		N: Simon Shapiro
		E: shimon@i-Connect.Net
		W: http://www.-i-Connect.Net/~shimon

Documentation/00-INDEX

+2 −16

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ DMA-API.txt
		- DMA API, pci_ API & extensions for non-consistent memory machines.
		DMA-ISA-LPC.txt
		- How to do DMA with ISA (and LPC) devices.
		DMA-mapping.txt
		- info for PCI drivers using DMA portably across all platforms.
		DocBook/
		- directory with DocBook templates etc. for kernel documentation.
		HOWTO
		@@ -43,8 +41,6 @@ ManagementStyle
		- how to (attempt to) manage kernel hackers.
		MSI-HOWTO.txt
		- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
		PCIEBUS-HOWTO.txt
		- a guide describing the PCI Express Port Bus driver.
		RCU/
		- directory with info on RCU (read-copy update).
		README.DAC960
		@@ -167,10 +163,8 @@ highuid.txt
		- notes on the change from 16 bit to 32 bit user/group IDs.
		hpet.txt
		- High Precision Event Timer Driver for Linux.
		hrtimer/
		- info on the timer_stats debugging facility for timer (ab)use.
		hrtimers/
		- info on the hrtimers subsystem for high-resolution kernel timers.
		timers/
		- info on the timer related topics
		hw_random.txt
		- info on Linux support for random number generator in i8xx chipsets.
		hwmon/
		@@ -287,12 +281,6 @@ parport.txt
		- how to use the parallel-port driver.
		parport-lowlevel.txt
		- 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/
		- info on the Linux PCMCIA driver.
		pi-futex.txt
		@@ -341,8 +329,6 @@ sgi-visws.txt
		- short blurb on the SGI Visual Workstations.
		sh/
		- directory with info on porting Linux to a new architecture.
		smart-config.txt
		- description of the Smart Config makefile feature.
		sound/
		- directory with info on sound card support.
		sparc/

Documentation/ABI/obsolete/o2cb

0 → 100644

+11 −0

Original line number	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	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.

Admin message