Commit e5f2ef7a authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30129cf2 3da889b6

CREDITS

+3 −3
Original line number Diff line number Diff line
@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061 
S: USA



N: Randy Dunlap

E: rdunlap@xenotime.net

W: http://www.xenotime.net/linux/linux.html

W: http://www.linux-usb.org

E: rdunlap@infradead.org

W: http://www.infradead.org/~rdunlap/

D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers

D: x86 SMP, ACPI, bootflag hacking

D: documentation, builds

S: (ask for current address)

S: USA

Documentation/SubmittingPatches

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ own source tree. For example: 
"dontdiff" is a list of files which are generated by the kernel during

the build process, and should be ignored in any diff(1)-generated

patch.  The "dontdiff" file is included in the kernel tree in

2.6.12 and later.  For earlier kernel versions, you can get it

from <http://www.xenotime.net/linux/doc/dontdiff>.

2.6.12 and later.



Make sure your patch does not include any extra files which do not

belong in a patch submission.  Make sure to review your patch -after-

Documentation/hwmon/adm1275

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Supported chips: 
    Addresses scanned: -

    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf



Author: Guenter Roeck <guenter.roeck@ericsson.com>

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





Description

Documentation/hwmon/adt7410

+10 −1
Original line number Diff line number Diff line
@@ -4,9 +4,14 @@ Kernel driver adt7410 
Supported chips:

  * Analog Devices ADT7410

    Prefix: 'adt7410'

    Addresses scanned: I2C 0x48 - 0x4B

    Addresses scanned: None

    Datasheet: Publicly available at the Analog Devices website

               http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf

  * Analog Devices ADT7420

    Prefix: 'adt7420'

    Addresses scanned: None

    Datasheet: Publicly available at the Analog Devices website

               http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf



Author: Hartmut Knaack <knaack.h@gmx.de>
@@ -27,6 +32,10 @@ value per second or even justget one sample on demand for power saving. 
Besides, it can completely power down its ADC, if power management is

required.



The ADT7420 is register compatible, the only differences being the package,

a slightly narrower operating temperature range (-40°C to +150°C), and a

better accuracy (0.25°C instead of 0.50°C.)



Configuration Notes

-------------------

Documentation/hwmon/jc42

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ Supported chips: 
    Addresses scanned: I2C 0x18 - 0x1f



Author:

	Guenter Roeck <guenter.roeck@ericsson.com>

	Guenter Roeck <linux@roeck-us.net>





Description