Merge branch 'linux-2.6' into for-linus (79acbb3f) · Commits · e / devices / android_kernel_fairphone_FP3

.gitignore

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	# Top-level generic files		# Top-level generic files
	#		#
	tags		tags
			TAGS
	vmlinux*		vmlinux*
	System.map		System.map
	Module.symvers		Module.symvers

CREDITS

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ S: Longford, Ireland
	S: Sydney, Australia		S: Sydney, Australia

	N: Tigran A. Aivazian		N: Tigran A. Aivazian
	E: tigran@veritas.com		E: tigran@aivazian.fsnet.co.uk
	W: http://www.moses.uklinux.net/patches		W: http://www.moses.uklinux.net/patches
	D: BFS filesystem		D: BFS filesystem
	D: Intel IA32 CPU microcode update support		D: Intel IA32 CPU microcode update support
	@@ -2598,6 +2598,9 @@ S: Ucitelska 1576
	S: Prague 8		S: Prague 8
	S: 182 00 Czech Republic		S: 182 00 Czech Republic

			N: Rick Payne
			D: RFC2385 Support for TCP

	N: Barak A. Pearlmutter		N: Barak A. Pearlmutter
	E: bap@cs.unm.edu		E: bap@cs.unm.edu
	W: http://www.cs.unm.edu/~bap/		W: http://www.cs.unm.edu/~bap/
	@@ -3511,14 +3514,12 @@ D: The Linux Support Team Erlangen

	N: David Weinehall		N: David Weinehall
	E: tao@acc.umu.se		E: tao@acc.umu.se
			P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36 E1D1 D14E 8526 DC47 CA16
	W: http://www.acc.umu.se/~tao/		W: http://www.acc.umu.se/~tao/
	W: http://www.acc.umu.se/~mcalinux/		D: v2.0 kernel maintainer
	D: Fixes for the NE/2-driver		D: Fixes for the NE/2-driver
	D: Miscellaneous MCA-support		D: Miscellaneous MCA-support
	D: Cleanup of the Config-files		D: Cleanup of the Config-files
	S: Axtorpsvagen 40:20
	S: S-903 37 UMEA
	S: Sweden

	N: Matt Welsh		N: Matt Welsh
	E: mdw@metalab.unc.edu		E: mdw@metalab.unc.edu

Documentation/ABI/testing/sysfs-power

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ Description:
	these states.		these states.

	What: /sys/power/disk		What: /sys/power/disk
	Date: August 2006		Date: September 2006
	Contact: Rafael J. Wysocki <rjw@sisk.pl>		Contact: Rafael J. Wysocki <rjw@sisk.pl>
	Description:		Description:
	The /sys/power/disk file controls the operating mode of the		The /sys/power/disk file controls the operating mode of the
	@@ -39,6 +39,19 @@ Description:
	'reboot' - the memory image will be saved by the kernel and		'reboot' - the memory image will be saved by the kernel and
	the system will be rebooted.		the system will be rebooted.

			Additionally, /sys/power/disk can be used to turn on one of the
			two testing modes of the suspend-to-disk mechanism: 'testproc'
			or 'test'. If the suspend-to-disk mechanism is in the
			'testproc' mode, writing 'disk' to /sys/power/state will cause
			the kernel to disable nonboot CPUs and freeze tasks, wait for 5
			seconds, unfreeze tasks and enable nonboot CPUs. If it is in
			the 'test' mode, writing 'disk' to /sys/power/state will cause
			the kernel to disable nonboot CPUs and freeze tasks, shrink
			memory, suspend devices, wait for 5 seconds, resume devices,
			unfreeze tasks and enable nonboot CPUs. Then, we are able to
			look in the log messages and work out, for example, which code
			is being slow and which device drivers are misbehaving.

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

	@@ -46,6 +59,8 @@ Description:
	'platform'		'platform'
	'shutdown'		'shutdown'
	'reboot'		'reboot'
			'testproc'
			'test'

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

Documentation/Changes

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -201,7 +201,7 @@ udev
	----		----
	udev is a userspace application for populating /dev dynamically with		udev is a userspace application for populating /dev dynamically with
	only entries for devices actually present. udev replaces the basic		only entries for devices actually present. udev replaces the basic
	functionality of devfs, while allowing persistant device naming for		functionality of devfs, while allowing persistent device naming for
	devices.		devices.

	FUSE		FUSE

Documentation/DMA-API.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -489,7 +489,7 @@ size is the size of the area (must be multiples of PAGE_SIZE).
	flags can be or'd together and are		flags can be or'd together and are

	DMA_MEMORY_MAP - request that the memory returned from		DMA_MEMORY_MAP - request that the memory returned from
	dma_alloc_coherent() be directly writeable.		dma_alloc_coherent() be directly writable.

	DMA_MEMORY_IO - request that the memory returned from		DMA_MEMORY_IO - request that the memory returned from
	dma_alloc_coherent() be addressable using read/write/memcpy_toio etc.		dma_alloc_coherent() be addressable using read/write/memcpy_toio etc.