Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel-stable (a9fda02b) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+20 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1142,7 +1142,7 @@ ATLX ETHERNET DRIVERS
	M: Jay Cliburn <jcliburn@gmail.com>		M: Jay Cliburn <jcliburn@gmail.com>
	M: Chris Snook <chris.snook@gmail.com>		M: Chris Snook <chris.snook@gmail.com>
	M: Jie Yang <jie.yang@atheros.com>		M: Jie Yang <jie.yang@atheros.com>
	L: atl1-devel@lists.sourceforge.net		L: netdev@vger.kernel.org
	W: http://sourceforge.net/projects/atl1		W: http://sourceforge.net/projects/atl1
	W: http://atl1.sourceforge.net		W: http://atl1.sourceforge.net
	S: Maintained		S: Maintained
	@@ -1227,7 +1227,7 @@ F: drivers/auxdisplay/
	F: include/linux/cfag12864b.h		F: include/linux/cfag12864b.h

	AVR32 ARCHITECTURE		AVR32 ARCHITECTURE
	M: Haavard Skinnemoen <hskinnemoen@atmel.com>		M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
	W: http://www.atmel.com/products/AVR32/		W: http://www.atmel.com/products/AVR32/
	W: http://avr32linux.org/		W: http://avr32linux.org/
	W: http://avrfreaks.net/		W: http://avrfreaks.net/
	@@ -1235,7 +1235,7 @@ S: Supported
	F: arch/avr32/		F: arch/avr32/

	AVR32/AT32AP MACHINE SUPPORT		AVR32/AT32AP MACHINE SUPPORT
	M: Haavard Skinnemoen <hskinnemoen@atmel.com>		M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
	S: Supported		S: Supported
	F: arch/avr32/mach-at32ap/		F: arch/avr32/mach-at32ap/

	@@ -2206,6 +2206,12 @@ W: http://acpi4asus.sf.net
	S: Maintained		S: Maintained
	F: drivers/platform/x86/eeepc-laptop.c		F: drivers/platform/x86/eeepc-laptop.c

			EFIFB FRAMEBUFFER DRIVER
			L: linux-fbdev@vger.kernel.org
			M: Peter Jones <pjones@redhat.com>
			S: Maintained
			F: drivers/video/efifb.c

	EFS FILESYSTEM		EFS FILESYSTEM
	W: http://aeschi.ch.eu.org/efs/		W: http://aeschi.ch.eu.org/efs/
	S: Orphan		S: Orphan
	@@ -2669,6 +2675,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com>
	L: lm-sensors@lm-sensors.org		L: lm-sensors@lm-sensors.org
	W: http://www.lm-sensors.org/		W: http://www.lm-sensors.org/
	T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/		T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
			T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
	S: Maintained		S: Maintained
	F: Documentation/hwmon/		F: Documentation/hwmon/
	F: drivers/hwmon/		F: drivers/hwmon/
	@@ -3906,10 +3914,8 @@ F: Documentation/serial/moxa-smartio
	F: drivers/char/mxser.*		F: drivers/char/mxser.*

	MSI LAPTOP SUPPORT		MSI LAPTOP SUPPORT
	M: Lennart Poettering <mzxreary@0pointer.de>		M: Lee, Chun-Yi <jlee@novell.com>
	L: platform-driver-x86@vger.kernel.org		L: platform-driver-x86@vger.kernel.org
	W: https://tango.0pointer.de/mailman/listinfo/s270-linux
	W: http://0pointer.de/lennart/tchibo.html
	S: Maintained		S: Maintained
	F: drivers/platform/x86/msi-laptop.c		F: drivers/platform/x86/msi-laptop.c

	@@ -3926,8 +3932,10 @@ S: Supported
	F: drivers/mfd/		F: drivers/mfd/

	MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM		MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
	S: Orphan		M: Chris Ball <cjb@laptop.org>
	L: linux-mmc@vger.kernel.org		L: linux-mmc@vger.kernel.org
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
			S: Maintained
	F: drivers/mmc/		F: drivers/mmc/
	F: include/linux/mmc/		F: include/linux/mmc/

	@@ -3949,7 +3957,7 @@ F: drivers/char/isicom.c
	F: include/linux/isicom.h		F: include/linux/isicom.h

	MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER		MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
	M: Felipe Balbi <felipe.balbi@nokia.com>		M: Felipe Balbi <balbi@ti.com>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org
	T: git git://gitorious.org/usb/usb.git		T: git git://gitorious.org/usb/usb.git
	S: Maintained		S: Maintained
	@@ -4247,7 +4255,7 @@ S: Maintained
	F: drivers/char/hw_random/omap-rng.c		F: drivers/char/hw_random/omap-rng.c

	OMAP USB SUPPORT		OMAP USB SUPPORT
	M: Felipe Balbi <felipe.balbi@nokia.com>		M: Felipe Balbi <balbi@ti.com>
	M: David Brownell <dbrownell@users.sourceforge.net>		M: David Brownell <dbrownell@users.sourceforge.net>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org
	L: linux-omap@vger.kernel.org		L: linux-omap@vger.kernel.org
	@@ -5098,8 +5106,10 @@ S: Maintained
	F: drivers/mmc/host/sdricoh_cs.c		F: drivers/mmc/host/sdricoh_cs.c

	SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER		SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
	S: Orphan		M: Chris Ball <cjb@laptop.org>
	L: linux-mmc@vger.kernel.org		L: linux-mmc@vger.kernel.org
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
			S: Maintained
	F: drivers/mmc/host/sdhci.*		F: drivers/mmc/host/sdhci.*

	SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)		SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 36		SUBLEVEL = 36
	EXTRAVERSION = -rc4		EXTRAVERSION = -rc6
	NAME = Sheep on Meth		NAME = Sheep on Meth

	# DOCUMENTATION		# DOCUMENTATION

arch/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,9 @@ config HAVE_OPROFILE

	config KPROBES		config KPROBES
	bool "Kprobes"		bool "Kprobes"
	depends on KALLSYMS && MODULES		depends on MODULES
	depends on HAVE_KPROBES		depends on HAVE_KPROBES
			select KALLSYMS
	help		help
	Kprobes allows you to trap at almost any kernel address and		Kprobes allows you to trap at almost any kernel address and
	execute a callback function. register_kprobe() establishes		execute a callback function. register_kprobe() establishes
	@@ -45,7 +46,6 @@ config OPTPROBES
	def_bool y		def_bool y
	depends on KPROBES && HAVE_OPTPROBES		depends on KPROBES && HAVE_OPTPROBES
	depends on !PREEMPT		depends on !PREEMPT
	select KALLSYMS_ALL

	config HAVE_EFFICIENT_UNALIGNED_ACCESS		config HAVE_EFFICIENT_UNALIGNED_ACCESS
	bool		bool

arch/alpha/include/asm/cacheflush.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,8 @@ extern void smp_imb(void);
	/* ??? Ought to use this in arch/alpha/kernel/signal.c too. */		/* ??? Ought to use this in arch/alpha/kernel/signal.c too. */

	#ifndef CONFIG_SMP		#ifndef CONFIG_SMP
			#include <linux/sched.h>

	extern void __load_new_mm_context(struct mm_struct *);		extern void __load_new_mm_context(struct mm_struct *);
	static inline void		static inline void
	flush_icache_user_range(struct vm_area_struct vma, struct page page,		flush_icache_user_range(struct vm_area_struct vma, struct page page,

arch/alpha/include/asm/unistd.h

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -449,10 +449,13 @@
	#define __NR_pwritev 491		#define __NR_pwritev 491
	#define __NR_rt_tgsigqueueinfo 492		#define __NR_rt_tgsigqueueinfo 492
	#define __NR_perf_event_open 493		#define __NR_perf_event_open 493
			#define __NR_fanotify_init 494
			#define __NR_fanotify_mark 495
			#define __NR_prlimit64 496

	#ifdef __KERNEL__		#ifdef __KERNEL__

	#define NR_SYSCALLS 494		#define NR_SYSCALLS 497

	#define __ARCH_WANT_IPC_PARSE_VERSION		#define __ARCH_WANT_IPC_PARSE_VERSION
	#define __ARCH_WANT_OLD_READDIR		#define __ARCH_WANT_OLD_READDIR
	@@ -463,6 +466,7 @@
	#define __ARCH_WANT_SYS_OLD_GETRLIMIT		#define __ARCH_WANT_SYS_OLD_GETRLIMIT
	#define __ARCH_WANT_SYS_OLDUMOUNT		#define __ARCH_WANT_SYS_OLDUMOUNT
	#define __ARCH_WANT_SYS_SIGPENDING		#define __ARCH_WANT_SYS_SIGPENDING
			#define __ARCH_WANT_SYS_RT_SIGSUSPEND

	/* "Conditional" syscalls. What we want is		/* "Conditional" syscalls. What we want is