Commit 1503af66 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/header-guards 



Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents a3186316 024e8ac0

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -317,6 +317,14 @@ S: 2322 37th Ave SW 
S: Seattle, Washington 98126-2010

S: USA



N: Muli Ben-Yehuda

E: mulix@mulix.org

E: muli@il.ibm.com

W: http://www.mulix.org

D: trident OSS sound driver, x86-64 dma-ops and Calgary IOMMU,

D: KVM and Xen bits and other misc. hackery.

S: Haifa, Israel



N: Johannes Berg

E: johannes@sipsolutions.net

W: http://johannes.sipsolutions.net/

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -361,8 +361,6 @@ telephony/ 
	- directory with info on telephony (e.g. voice over IP) support.

time_interpolators.txt

	- info on time interpolators.

tipar.txt

	- information about Parallel link cable for Texas Instruments handhelds.

tty.txt

	- guide to the locking policies of the tty layer.

uml/

Documentation/ABI/testing/sysfs-dev

0 → 100644
+20 −0
Original line number Diff line number Diff line 
What:		/sys/dev

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Dan Williams <dan.j.williams@intel.com>

Description:	The /sys/dev tree provides a method to look up the sysfs

		path for a device using the information returned from

		stat(2).  There are two directories, 'block' and 'char',

		beneath /sys/dev containing symbolic links with names of

		the form "<major>:<minor>".  These links point to the

		corresponding sysfs path for the given device.



		Example:

		$ readlink /sys/dev/block/8:32

		../../block/sdc



		Entries in /sys/dev/char and /sys/dev/block will be

		dynamically created and destroyed as devices enter and

		leave the system.



Users:		mdadm <linux-raid@vger.kernel.org>

Documentation/ABI/testing/sysfs-devices-memory

0 → 100644
+24 −0
Original line number Diff line number Diff line 
What:		/sys/devices/system/memory

Date:		June 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The /sys/devices/system/memory contains a snapshot of the

		internal state of the kernel memory blocks. Files could be

		added or removed dynamically to represent hot-add/remove

		operations.



Users:		hotplug memory add/remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/



What:		/sys/devices/system/memory/memoryX/removable

Date:		June 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/removable

		indicates whether this memory block is removable or not.

		This is useful for a user-level agent to determine

		identify removable sections of the memory before attempting

		potentially expensive hot-remove memory operation



Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

Documentation/ABI/testing/sysfs-kernel-mm

0 → 100644
+6 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/mm

Date:		July 2008

Contact:	Nishanth Aravamudan <nacc@us.ibm.com>, VM maintainers

Description:

		/sys/kernel/mm/ should contain any and all VM

		related information in /sys/kernel/.