Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (bef98650) · Commits · e / devices / android_kernel_teracube_emerald

.gitignore

+1 −0

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

CREDITS

+6 −5

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

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

		N: Rick Payne
		D: RFC2385 Support for TCP

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

		N: David Weinehall
		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/~mcalinux/
		D: v2.0 kernel maintainer
		D: Fixes for the NE/2-driver
		D: Miscellaneous MCA-support
		D: Cleanup of the Config-files
		S: Axtorpsvagen 40:20
		S: S-903 37 UMEA
		S: Sweden

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

Documentation/00-INDEX

+0 −2

Original line number	Diff line number	Diff line
		@@ -104,8 +104,6 @@ firmware_class/
		- request_firmware() hotplug interface info.
		floppy.txt
		- notes and driver options for the floppy disk driver.
		ftape.txt
		- notes about the floppy tape device driver.
		hayes-esp.txt
		- info on using the Hayes ESP serial driver.
		highuid.txt

Documentation/Changes

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ udev
		----
		udev is a userspace application for populating /dev dynamically with
		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.

		FUSE

Documentation/DMA-API.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ To get this part of the dma_ API, you must #include <linux/dmapool.h>
		Many drivers need lots of small dma-coherent memory regions for DMA
		descriptors or I/O buffers. Rather than allocating in units of a page
		or more using dma_alloc_coherent(), you can use DMA pools. These work
		much like a kmem_cache_t, except that they use the dma-coherent allocator
		much like a struct kmem_cache, except that they use the dma-coherent allocator
		not __get_free_pages(). Also, they understand common hardware constraints
		for alignment, like queue heads needing to be aligned on N byte boundaries.

		@@ -94,7 +94,7 @@ The pool create() routines initialize a pool of dma-coherent buffers
		for use with a given device. It must be called in a context which
		can sleep.

		The "name" is for diagnostics (like a kmem_cache_t name); dev and size
		The "name" is for diagnostics (like a struct kmem_cache name); dev and size
		are like what you'd pass to dma_alloc_coherent(). The device's hardware
		alignment requirement for this type of data is "align" (which is expressed
		in bytes, and must be a power of two). If your device has no boundary
		@@ -431,10 +431,10 @@ be identical to those passed in (and returned by
		dma_alloc_noncoherent()).

		int
		dma_is_consistent(dma_addr_t dma_handle)
		dma_is_consistent(struct device *dev, dma_addr_t dma_handle)

		returns true if the memory pointed to by the dma_handle is actually
		consistent.
		returns true if the device dev is performing consistent DMA on the memory
		area pointed to by the dma_handle.

		int
		dma_get_cache_alignment(void)
		@@ -459,7 +459,7 @@ anything like this. You must also be extra careful about accessing
		memory you intend to sync partially.

		void
		dma_cache_sync(void *vaddr, size_t size,
		dma_cache_sync(struct device dev, void vaddr, size_t size,
		enum dma_data_direction direction)

		Do a partial sync of memory that was allocated by
		@@ -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

		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_alloc_coherent() be addressable using read/write/memcpy_toio etc.