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

Commit cd2d95d9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.9-rc7' into regulator-fix-core 

Linux 3.9-rc7

Trivial context overlap conflicts:
	MAINTAINERS
parents 88dd75af 41ef2d56

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/DocBook/device-drivers.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

     <title>16x50 UART Driver</title>

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250/8250.c

!Edrivers/tty/serial/8250/8250_core.c

  </chapter>

  </chapter>





  <chapter id="fbdev">

  <chapter id="fbdev">

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