Merge branch 'master' of... (f5a18f93) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/power/runtime_pm.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -431,8 +431,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:

	void pm_runtime_irq_safe(struct device *dev);		void pm_runtime_irq_safe(struct device *dev);
	- set the power.irq_safe flag for the device, causing the runtime-PM		- set the power.irq_safe flag for the device, causing the runtime-PM
	suspend and resume callbacks (but not the idle callback) to be invoked		callbacks to be invoked with interrupts off
	with interrupts disabled

	void pm_runtime_mark_last_busy(struct device *dev);		void pm_runtime_mark_last_busy(struct device *dev);
	- set the power.last_busy field to the current time		- set the power.last_busy field to the current time

MAINTAINERS

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2649,11 +2649,11 @@ F: drivers/net/wan/dlci.c
	F: drivers/net/wan/sdla.c		F: drivers/net/wan/sdla.c

	FRAMEBUFFER LAYER		FRAMEBUFFER LAYER
	M: Paul Mundt <lethal@linux-sh.org>		M: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
	L: linux-fbdev@vger.kernel.org		L: linux-fbdev@vger.kernel.org
	W: http://linux-fbdev.sourceforge.net/		W: http://linux-fbdev.sourceforge.net/
	Q: http://patchwork.kernel.org/project/linux-fbdev/list/		Q: http://patchwork.kernel.org/project/linux-fbdev/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git		T: git git://github.com/schandinat/linux-2.6.git fbdev-next
	S: Maintained		S: Maintained
	F: Documentation/fb/		F: Documentation/fb/
	F: Documentation/devicetree/bindings/fb/		F: Documentation/devicetree/bindings/fb/
	@@ -4450,8 +4450,8 @@ M: "David S. Miller" <davem@davemloft.net>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://www.linuxfoundation.org/en/Net		W: http://www.linuxfoundation.org/en/Net
	W: http://patchwork.ozlabs.org/project/netdev/list/		W: http://patchwork.ozlabs.org/project/netdev/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
	S: Maintained		S: Maintained
	F: net/		F: net/
	F: include/net/		F: include/net/
	@@ -5532,6 +5532,7 @@ F: include/media/7146

	SAMSUNG AUDIO (ASoC) DRIVERS		SAMSUNG AUDIO (ASoC) DRIVERS
	M: Jassi Brar <jassisinghbrar@gmail.com>		M: Jassi Brar <jassisinghbrar@gmail.com>
			M: Sangbeom Kim <sbkim73@samsung.com>
	L: alsa-devel@alsa-project.org (moderated for non-subscribers)		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	S: Supported		S: Supported
	F: sound/soc/samsung		F: sound/soc/samsung

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 1		PATCHLEVEL = 1
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc3		EXTRAVERSION = -rc4
	NAME = "Divemaster Edition"		NAME = "Divemaster Edition"

	# DOCUMENTATION		# DOCUMENTATION

arch/alpha/kernel/systbls.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -360,7 +360,7 @@ sys_call_table:
	.quad sys_newuname		.quad sys_newuname
	.quad sys_nanosleep /* 340 */		.quad sys_nanosleep /* 340 */
	.quad sys_mremap		.quad sys_mremap
	.quad sys_nfsservctl		.quad sys_ni_syscall /* old nfsservctl */
	.quad sys_setresuid		.quad sys_setresuid
	.quad sys_getresuid		.quad sys_getresuid
	.quad sys_pciconfig_read /* 345 */		.quad sys_pciconfig_read /* 345 */

arch/arm/Kconfig

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1271,6 +1271,18 @@ config ARM_ERRATA_754327
	This workaround defines cpu_relax() as smp_mb(), preventing correctly		This workaround defines cpu_relax() as smp_mb(), preventing correctly
	written polling loops from denying visibility of updates to memory.		written polling loops from denying visibility of updates to memory.

			config ARM_ERRATA_364296
			bool "ARM errata: Possible cache data corruption with hit-under-miss enabled"
			depends on CPU_V6 && !SMP
			help
			This options enables the workaround for the 364296 ARM1136
			r0p2 erratum (possible cache data corruption with
			hit-under-miss enabled). It sets the undocumented bit 31 in
			the auxiliary control register and the FI bit in the control
			register, thus disabling hit-under-miss without putting the
			processor into full low interrupt latency mode. ARM11MPCore
			is not affected.

	endmenu		endmenu

	source "arch/arm/common/Kconfig"		source "arch/arm/common/Kconfig"