Merge commit 'origin/master' into next (874f2f99) · Commits · e / devices / android_kernel_teracube_2e

Documentation/dontdiff

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ av_permissions.h
		bbootsect
		bin2c
		binkernel.spec
		binoffset
		bootsect
		bounds.h
		bsetup

Documentation/kernel-parameters.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,10 @@ and is between 256 and 4096 characters. It is defined in the file
		acpi_display_output=video
		See above.

		acpi_early_pdc_eval [HW,ACPI] Evaluate processor _PDC methods
		early. Needed on some platforms to properly
		initialize the EC.

		acpi_irq_balance [HW,ACPI]
		ACPI will balance active IRQs
		default in APIC mode
		@@ -311,6 +315,11 @@ and is between 256 and 4096 characters. It is defined in the file
		aic79xx= [HW,SCSI]
		See Documentation/scsi/aic79xx.txt.

		alignment= [KNL,ARM]
		Allow the default userspace alignment fault handler
		behaviour to be specified. Bit 0 enables warnings,
		bit 1 enables fixups, and bit 2 sends a segfault.

		amd_iommu= [HW,X86-84]
		Pass parameters to the AMD IOMMU driver in the system.
		Possible values are:

Documentation/lguest/lguest.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		#include <sys/uio.h>
		#include <termios.h>
		#include <getopt.h>
		#include <zlib.h>
		#include <assert.h>
		#include <sched.h>
		#include <limits.h>

Documentation/networking/ip-sysctl.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -1074,10 +1074,10 @@ regen_max_retry - INTEGER
		Default: 5

		max_addresses - INTEGER
		Number of maximum addresses per interface. 0 disables limitation.
		It is recommended not set too large value (or 0) because it would
		be too easy way to crash kernel to allow to create too much of
		autoconfigured addresses.
		Maximum number of autoconfigured addresses per interface. Setting
		to zero disables the limitation. It is not recommended to set this
		value too large (or to zero) because it would be an easy way to
		crash the kernel by allowing too many addresses to be created.
		Default: 16

		disable_ipv6 - BOOLEAN

MAINTAINERS

+13 −8

Original line number	Diff line number	Diff line
		@@ -616,10 +616,10 @@ M: Richard Purdie <rpurdie@rpsys.net>
		S: Maintained

		ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
		M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
		M: Paulius Zaleckas <paulius.zaleckas@gmail.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		T: git git://gitorious.org/linux-gemini/mainline.git
		S: Maintained
		S: Odd Fixes
		F: arch/arm/mach-gemini/

		ARM/EBSA110 MACHINE SUPPORT
		@@ -641,9 +641,9 @@ T: topgit git://git.openezx.org/openezx.git
		F: arch/arm/mach-pxa/ezx.c

		ARM/FARADAY FA526 PORT
		M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
		M: Paulius Zaleckas <paulius.zaleckas@gmail.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		S: Odd Fixes
		F: arch/arm/mm/-fa

		ARM/FOOTBRIDGE ARCHITECTURE
		@@ -1733,10 +1733,9 @@ F: include/linux/tfrc.h
		F: net/dccp/

		DECnet NETWORK LAYER
		M: Christine Caulfield <christine.caulfield@googlemail.com>
		W: http://linux-decnet.sourceforge.net
		L: linux-decnet-user@lists.sourceforge.net
		S: Maintained
		S: Orphan
		F: Documentation/networking/decnet.txt
		F: net/decnet/

		@@ -2394,6 +2393,12 @@ L: linuxppc-dev@ozlabs.org
		S: Odd Fixes
		F: drivers/char/hvc_*

		VIRTIO CONSOLE DRIVER
		M: Amit Shah <amit.shah@redhat.com>
		L: virtualization@lists.linux-foundation.org
		S: Maintained
		F: drivers/char/virtio_console.c

		GSPCA FINEPIX SUBDRIVER
		M: Frank Zago <frank@zago.net>
		L: linux-media@vger.kernel.org
		@@ -3490,9 +3495,9 @@ S: Maintained
		F: drivers/net/wireless/libertas/

		MARVELL MV643XX ETHERNET DRIVER
		M: Lennert Buytenhek <buytenh@marvell.com>
		M: Lennert Buytenhek <buytenh@wantstofly.org>
		L: netdev@vger.kernel.org
		S: Supported
		S: Maintained
		F: drivers/net/mv643xx_eth.*
		F: include/linux/mv643xx.h