Merge branch 'sh/stable-updates' (921a2208) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+11 −0

Original line number	Diff line number	Diff line
		@@ -1472,6 +1472,12 @@ L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/fnic/

		CMPC ACPI DRIVER
		M: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
		M: Daniel Oliveira Nascimento <don@syst.com.br>
		S: Supported
		F: drivers/platform/x86/classmate-laptop.c

		CODA FILE SYSTEM
		M: Jan Harkes <jaharkes@cs.cmu.edu>
		M: coda@cs.cmu.edu
		@@ -3646,6 +3652,11 @@ W: http://0pointer.de/lennart/tchibo.html
		S: Maintained
		F: drivers/platform/x86/msi-laptop.c

		MSI WMI SUPPORT
		M: Anisse Astier <anisse@astier.eu>
		S: Supported
		F: drivers/platform/x86/msi-wmi.c

		MULTIFUNCTION DEVICES (MFD)
		M: Samuel Ortiz <sameo@linux.intel.com>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 33
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
		* we need to ensure that the data will be coherent
		* with user mappings.
		*/
		__cpuc_flush_kernel_dcache_area(ptr, size);
		__cpuc_flush_dcache_area(ptr, size);
		}
		free_safe_buffer(dev->archdata.dmabounce, buf);
		}

+0 −1

+0 −1