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

Commit 67028154 authored Apr 09, 2013 by Arnd Bergmann

Merge tag 'omap-for-v3.10/board-signed' of...

Merge tag 'omap-for-v3.10/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

From Tony Lindgren <tony@atomide.com>:

Board related changes for v3.10 merge window. These are pretty
much all non-critical fixes for platform device initialization
that will be needed until we can drop the board-*.c files and
move to DT based boot.

* tag 'omap-for-v3.10/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
  ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
  ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
  omap2+: Remove useless Makefile line
  omap2+: Remove useless Makefile line
  ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
  ARM: OMAP1: fix omap_udc registration

Includes an update to Linux 3.9-rc6

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

parents 21cb7963 06993d6a

CREDITS

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1510,6 +1510,14 @@ D: Natsemi ethernet
	D: Cobalt Networks (x86) support		D: Cobalt Networks (x86) support
	D: This-and-That		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		N: Dirk Hohndel
	E: hohndel@suse.de		E: hohndel@suse.de
	D: The XFree86[tm] Project		D: The XFree86[tm] Project

Documentation/hwmon/lm75

+1 −1

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

Documentation/i2c/busses/i2c-diolan-u2c

+1 −1

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

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

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

Documentation/networking/ipvs-sysctl.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,13 @@ amemthresh - INTEGER
	enabled and the variable is automatically set to 2, otherwise		enabled and the variable is automatically set to 2, otherwise
	the strategy is disabled and the variable is set to 1.		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		conntrack - BOOLEAN
	0 - disabled (default)		0 - disabled (default)
	not 0 - enabled		not 0 - enabled

Documentation/sound/alsa/ALSA-Configuration.txt

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -890,9 +890,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)		enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)
	power_save - Automatic power-saving timeout (in second, 0 =		power_save - Automatic power-saving timeout (in second, 0 =
	disable)		disable)
	power_save_controller - Support runtime D3 of HD-audio controller		power_save_controller - Reset HD-audio controller in power-saving mode
	(-1 = on for supported chip (default), false = off,		(default = on)
	true = force to on even for unsupported hardware)
	align_buffer_size - Force rounding of buffer/period sizes to multiples		align_buffer_size - Force rounding of buffer/period sizes to multiples
	of 128 bytes. This is more efficient in terms of memory		of 128 bytes. This is more efficient in terms of memory
	access but isn't required by the HDA spec and prevents		access but isn't required by the HDA spec and prevents
	@@ -912,7 +911,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		models depending on the codec chip. The list of available models
	is found in HD-Audio-Models.txt		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		model is given, the driver uses the generic codec parser without
	"codec-patch". It's sometimes good for testing and debugging.		"codec-patch". It's sometimes good for testing and debugging.