Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f64240 authored Apr 09, 2013 by Arnd Bergmann

Merge branch 'mxs/cleanup' into next/multiplatform



This is a dependency for mxs/multiplatform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Conflicts:
	drivers/clocksource/Makefile

parents 9bc128e1 e933a1a1

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -1510,6 +1510,14 @@ D: Natsemi ethernet
		D: Cobalt Networks (x86) support
		D: This-and-That

		N: Mark M. Hoffman
		E: mhoffman@lightlink.com
		D: asb100, lm93 and smsc47b397 hardware monitoring drivers
		D: hwmon subsystem core
		D: hwmon subsystem maintainer
		D: i2c-sis96x and i2c-stub SMBus drivers
		S: USA

		N: Dirk Hohndel
		E: hohndel@suse.de
		D: The XFree86[tm] Project

Documentation/hwmon/lm75

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ Supported chips:
		Datasheet: Publicly available at the Maxim website
		http://www.maxim-ic.com/
		* Microchip (TelCom) TCN75
		Prefix: 'lm75'
		Prefix: 'tcn75'
		Addresses scanned: none
		Datasheet: Publicly available at the Microchip website
		http://www.microchip.com/

Documentation/i2c/busses/i2c-diolan-u2c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Supported adapters:
		Documentation:
		http://www.diolan.com/i2c/u2c12.html

		Author: Guenter Roeck <guenter.roeck@ericsson.com>
		Author: Guenter Roeck <linux@roeck-us.net>

		Description
		-----------

Documentation/networking/ipvs-sysctl.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,13 @@ amemthresh - INTEGER
		enabled and the variable is automatically set to 2, otherwise
		the strategy is disabled and the variable is set to 1.

		backup_only - BOOLEAN
		0 - disabled (default)
		not 0 - enabled

		If set, disable the director function while the server is
		in backup mode to avoid packet loops for DR/TUN methods.

		conntrack - BOOLEAN
		0 - disabled (default)
		not 0 - enabled

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -912,7 +912,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
		models depending on the codec chip. The list of available models
		is found in HD-Audio-Models.txt

		The model name "genric" is treated as a special case. When this
		The model name "generic" is treated as a special case. When this
		model is given, the driver uses the generic codec parser without
		"codec-patch". It's sometimes good for testing and debugging.