Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline (a35197a8) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/kernel-parameters.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1535,6 +1535,10 @@ and is between 256 and 4096 characters. It is defined in the file
	register save and restore. The kernel will only save		register save and restore. The kernel will only save
	legacy floating-point registers on task switch.		legacy floating-point registers on task switch.

			noxsave [BUGS=X86] Disables x86 extended register state save
			and restore using xsave. The kernel will fallback to
			enabling legacy floating-point and sse state.

	nohlt [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or		nohlt [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
	wfi(ARM) instruction doesn't work correctly and not to		wfi(ARM) instruction doesn't work correctly and not to
	use it. This is also useful when using JTAG debugger.		use it. This is also useful when using JTAG debugger.

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -334,6 +334,7 @@ STAC9227/9228/9229/927x
	ref-no-jd Reference board without HP/Mic jack detection		ref-no-jd Reference board without HP/Mic jack detection
	3stack D965 3stack		3stack D965 3stack
	5stack D965 5stack + SPDIF		5stack D965 5stack + SPDIF
			5stack-no-fp D965 5stack without front panel
	dell-3stack Dell Dimension E520		dell-3stack Dell Dimension E520
	dell-bios Fixes with Dell BIOS setup		dell-bios Fixes with Dell BIOS setup
	auto BIOS setup (default)		auto BIOS setup (default)

MAINTAINERS

+19 −9

Original line number	Original line	Diff line number	Diff line
	@@ -624,6 +624,7 @@ M: paulius.zaleckas@teltonika.lt
	L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
	T: git git://gitorious.org/linux-gemini/mainline.git		T: git git://gitorious.org/linux-gemini/mainline.git
	S: Maintained		S: Maintained
			F: arch/arm/mach-gemini/

	ARM/EBSA110 MACHINE SUPPORT		ARM/EBSA110 MACHINE SUPPORT
	P: Russell King		P: Russell King
	@@ -650,6 +651,7 @@ P: Paulius Zaleckas
	M: paulius.zaleckas@teltonika.lt		M: paulius.zaleckas@teltonika.lt
	L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
	S: Maintained		S: Maintained
			F: arch/arm/mm/-fa

	ARM/FOOTBRIDGE ARCHITECTURE		ARM/FOOTBRIDGE ARCHITECTURE
	P: Russell King		P: Russell King
	@@ -1132,17 +1134,17 @@ F: fs/bfs/
	F: include/linux/bfs_fs.h		F: include/linux/bfs_fs.h

	BLACKFIN ARCHITECTURE		BLACKFIN ARCHITECTURE
	P: Bryan Wu		P: Mike Frysinger
	M: cooloney@kernel.org		M: vapier@gentoo.org
	L: uclinux-dist-devel@blackfin.uclinux.org		L: uclinux-dist-devel@blackfin.uclinux.org
	W: http://blackfin.uclinux.org		W: http://blackfin.uclinux.org
	S: Supported		S: Supported
	F: arch/blackfin/		F: arch/blackfin/

	BLACKFIN EMAC DRIVER		BLACKFIN EMAC DRIVER
	P: Bryan Wu		P: Michael Hennerich
	M: cooloney@kernel.org		M: michael.hennerich@analog.com
	L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)		L: uclinux-dist-devel@blackfin.uclinux.org
	W: http://blackfin.uclinux.org		W: http://blackfin.uclinux.org
	S: Supported		S: Supported
	F: drivers/net/bfin_mac.*		F: drivers/net/bfin_mac.*
	@@ -1150,7 +1152,7 @@ F: drivers/net/bfin_mac.*
	BLACKFIN RTC DRIVER		BLACKFIN RTC DRIVER
	P: Mike Frysinger		P: Mike Frysinger
	M: vapier.adi@gmail.com		M: vapier.adi@gmail.com
	L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)		L: uclinux-dist-devel@blackfin.uclinux.org
	W: http://blackfin.uclinux.org		W: http://blackfin.uclinux.org
	S: Supported		S: Supported
	F: drivers/rtc/rtc-bfin.c		F: drivers/rtc/rtc-bfin.c
	@@ -1158,7 +1160,7 @@ F: drivers/rtc/rtc-bfin.c
	BLACKFIN SERIAL DRIVER		BLACKFIN SERIAL DRIVER
	P: Sonic Zhang		P: Sonic Zhang
	M: sonic.zhang@analog.com		M: sonic.zhang@analog.com
	L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)		L: uclinux-dist-devel@blackfin.uclinux.org
	W: http://blackfin.uclinux.org		W: http://blackfin.uclinux.org
	S: Supported		S: Supported
	F: drivers/serial/bfin_5xx.c		F: drivers/serial/bfin_5xx.c
	@@ -1166,7 +1168,7 @@ F: drivers/serial/bfin_5xx.c
	BLACKFIN WATCHDOG DRIVER		BLACKFIN WATCHDOG DRIVER
	P: Mike Frysinger		P: Mike Frysinger
	M: vapier.adi@gmail.com		M: vapier.adi@gmail.com
	L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)		L: uclinux-dist-devel@blackfin.uclinux.org
	W: http://blackfin.uclinux.org		W: http://blackfin.uclinux.org
	S: Supported		S: Supported
	F: drivers/watchdog/bfin_wdt.c		F: drivers/watchdog/bfin_wdt.c
	@@ -1174,7 +1176,7 @@ F: drivers/watchdog/bfin_wdt.c
	BLACKFIN I2C TWI DRIVER		BLACKFIN I2C TWI DRIVER
	P: Sonic Zhang		P: Sonic Zhang
	M: sonic.zhang@analog.com		M: sonic.zhang@analog.com
	L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)		L: uclinux-dist-devel@blackfin.uclinux.org
	W: http://blackfin.uclinux.org/		W: http://blackfin.uclinux.org/
	S: Supported		S: Supported
	F: drivers/i2c/busses/i2c-bfin-twi.c		F: drivers/i2c/busses/i2c-bfin-twi.c
	@@ -1431,6 +1433,14 @@ P: Russell King
	M: linux@arm.linux.org.uk		M: linux@arm.linux.org.uk
	F: include/linux/clk.h		F: include/linux/clk.h

			CISCO FCOE HBA DRIVER
			P: Abhijeet Joglekar
			M: abjoglek@cisco.com
			P: Joe Eykholt
			M: jeykholt@cisco.com
			L: linux-scsi@vger.kernel.org
			S: Supported

	CODA FILE SYSTEM		CODA FILE SYSTEM
	P: Jan Harkes		P: Jan Harkes
	M: jaharkes@cs.cmu.edu		M: jaharkes@cs.cmu.edu

Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 30		SUBLEVEL = 30
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc7
	NAME = Vindictive Armadillo		NAME = Man-Eating Seals of Antiquity

	# DOCUMENTATION		# DOCUMENTATION
	# To see a list of typical targets execute "make help"		# To see a list of typical targets execute "make help"

arch/arm/mach-gemini/include/mach/hardware.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,10 +15,9 @@
	/*		/*
	* Memory Map definitions		* Memory Map definitions
	*/		*/
	/* FIXME: Does it really swap SRAM like this? */
	#ifdef CONFIG_GEMINI_MEM_SWAP		#ifdef CONFIG_GEMINI_MEM_SWAP
	# define GEMINI_DRAM_BASE 0x00000000		# define GEMINI_DRAM_BASE 0x00000000
	# define GEMINI_SRAM_BASE 0x20000000		# define GEMINI_SRAM_BASE 0x70000000
	#else		#else
	# define GEMINI_SRAM_BASE 0x00000000		# define GEMINI_SRAM_BASE 0x00000000
	# define GEMINI_DRAM_BASE 0x10000000		# define GEMINI_DRAM_BASE 0x10000000