Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (8a84fc15) · Commits · e / devices / android_kernel_fairphone_FP3

CREDITS

+11 −2

Original line number	Diff line number	Diff line
		@@ -1620,7 +1620,8 @@ D: fbdev hacking

		N: Jesper Juhl
		E: jesper.juhl@gmail.com
		D: Various fixes, cleanups and minor features.
		D: Various fixes, cleanups and minor features all over the tree.
		D: Wrote initial version of the hdaps driver (since passed on to others).
		S: Lemnosvej 1, 3.tv
		S: 2300 Copenhagen S.
		S: Denmark
		@@ -2384,6 +2385,13 @@ N: Thomas Molina
		E: tmolina@cablespeed.com
		D: bug fixes, documentation, minor hackery

		N: Paul Moore
		E: paul.moore@hp.com
		D: NetLabel author
		S: Hewlett-Packard
		S: 110 Spit Brook Road
		S: Nashua, NH 03062

		N: James Morris
		E: jmorris@namei.org
		W: http://namei.org/
		@@ -2470,7 +2478,8 @@ S: Derbyshire DE4 3RL
		S: United Kingdom

		N: Ian S. Nelson
		E: ian.nelson@echostar.com
		E: nelsonis@earthlink.net
		P: 1024D/00D3D983 3EFD 7B86 B888 D7E2 29B6 9E97 576F 1B97 00D3 D983
		D: Minor mmap and ide hacks
		S: 1370 Atlantis Ave.
		S: Lafayette CO, 80026

Documentation/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,8 @@ mtrr.txt
		- how to use PPro Memory Type Range Registers to increase performance.
		nbd.txt
		- info on a TCP implementation of a network block device.
		netlabel/
		- directory with information on the NetLabel subsystem.
		networking/
		- directory with info on various aspects of networking with Linux.
		nfsroot.txt

Documentation/ABI/obsolete/devfs→Documentation/ABI/removed/devfs

+2 −3

Original line number	Diff line number	Diff line
		What: devfs
		Date: July 2005
		Date: July 2005 (scheduled), finally removed in kernel v2.6.18
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Description:
		devfs has been unmaintained for a number of years, has unfixable
		races, contains a naming policy within the kernel that is
		against the LSB, and can be replaced by using udev.
		The files fs/devfs/, include/linux/devfs_fs.h will be removed,
		The files fs/devfs/, include/linux/devfs_fs.h were removed,
		along with the the assorted devfs function calls throughout the
		kernel tree.

		Users:

Documentation/ABI/testing/sysfs-power

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		What: /sys/power/
		Date: August 2006
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/power directory will contain files that will
		provide a unified interface to the power management
		subsystem.

		What: /sys/power/state
		Date: August 2006
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/power/state file controls the system power state.
		Reading from this file returns what states are supported,
		which is hard-coded to 'standby' (Power-On Suspend), 'mem'
		(Suspend-to-RAM), and 'disk' (Suspend-to-Disk).

		Writing to this file one of these strings causes the system to
		transition into that state. Please see the file
		Documentation/power/states.txt for a description of each of
		these states.

		What: /sys/power/disk
		Date: August 2006
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/power/disk file controls the operating mode of the
		suspend-to-disk mechanism. Reading from this file returns
		the name of the method by which the system will be put to
		sleep on the next suspend. There are four methods supported:
		'firmware' - means that the memory image will be saved to disk
		by some firmware, in which case we also assume that the
		firmware will handle the system suspend.
		'platform' - the memory image will be saved by the kernel and
		the system will be put to sleep by the platform driver (e.g.
		ACPI or other PM registers).
		'shutdown' - the memory image will be saved by the kernel and
		the system will be powered off.
		'reboot' - the memory image will be saved by the kernel and
		the system will be rebooted.

		The suspend-to-disk method may be chosen by writing to this
		file one of the accepted strings:

		'firmware'
		'platform'
		'shutdown'
		'reboot'

		It will only change to 'firmware' or 'platform' if the system
		supports that.

		What: /sys/power/image_size
		Date: August 2006
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/power/image_size file controls the size of the image
		created by the suspend-to-disk mechanism. It can be written a
		string representing a non-negative integer that will be used
		as an upper limit of the image size, in bytes. The kernel's
		suspend-to-disk code will do its best to ensure the image size
		will not exceed this number. However, if it turns out to be
		impossible, the kernel will try to suspend anyway using the
		smallest image possible. In particular, if "0" is written to
		this file, the suspend image will be as small as possible.

		Reading from this file will display the current image size
		limit, which is set to 500 MB by default.

		What: /sys/power/pm_trace
		Date: August 2006
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/power/pm_trace file controls the code which saves the
		last PM event point in the RTC across reboots, so that you can
		debug a machine that just hangs during suspend (or more
		commonly, during resume). Namely, the RTC is only used to save
		the last PM event point if this file contains '1'. Initially
		it contains '0' which may be changed to '1' by writing a
		string representing a nonzero integer into it.

		To use this debugging feature you should attempt to suspend
		the machine, then reboot it and run

		dmesg -s 1000000 \| grep 'hash matches'

		CAUTION: Using it will cause your machine's real-time (CMOS)
		clock to be set to a random invalid time after a resume.

Documentation/Changes

+3 −4

Original line number	Diff line number	Diff line
		@@ -37,15 +37,14 @@ o e2fsprogs 1.29 # tune2fs
		o jfsutils 1.1.3 # fsck.jfs -V
		o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1\|grep reiserfsprogs
		o xfsprogs 2.6.0 # xfs_db -V
		o pcmciautils 004
		o pcmcia-cs 3.1.21 # cardmgr -V
		o pcmciautils 004 # pccardctl -V
		o quota-tools 3.09 # quota -V
		o PPP 2.4.0 # pppd --version
		o isdn4k-utils 3.1pre1 # isdnctrl 2>&1\|grep version
		o nfs-utils 1.0.5 # showmount --version
		o procps 3.2.0 # ps --version
		o oprofile 0.9 # oprofiled --version
		o udev 071 # udevinfo -V
		o udev 081 # udevinfo -V

		Kernel compilation
		==================
		@@ -268,7 +267,7 @@ active clients.

		To enable this new functionality, you need to:

		mount -t nfsd nfsd /proc/fs/nfs
		mount -t nfsd nfsd /proc/fs/nfsd

		before running exportfs or mountd. It is recommended that all NFS
		services be protected from the internet-at-large by a firewall where