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

Commit 3eb9992c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.15-rc2 into staging-next 



This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e347fa5f a798c10f

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com> 
Sam Ravnborg <sam@mars.ravnborg.org>

Sam Ravnborg <sam@mars.ravnborg.org>

Sascha Hauer <s.hauer@pengutronix.de>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Simon Kelley <simon@thekelleys.org.uk>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Stephen Hemminger <shemminger@osdl.org>

Documentation/DocBook/device-drivers.tmpl

+5 −5
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ X!Isound/sound_firmware.c 
     </para>

     </para>





     <sect1><title>Frame Buffer Memory</title>

     <sect1><title>Frame Buffer Memory</title>

!Edrivers/video/fbmem.c

!Edrivers/video/fbdev/core/fbmem.c

     </sect1>

     </sect1>

<!--

<!--

     <sect1><title>Frame Buffer Console</title>

     <sect1><title>Frame Buffer Console</title>
@@ -284,7 +284,7 @@ X!Edrivers/video/console/fbcon.c 
     </sect1>

     </sect1>

-->

-->

     <sect1><title>Frame Buffer Colormap</title>

     <sect1><title>Frame Buffer Colormap</title>

!Edrivers/video/fbcmap.c

!Edrivers/video/fbdev/core/fbcmap.c

     </sect1>

     </sect1>

<!-- FIXME:

<!-- FIXME:

  drivers/video/fbgen.c has no docs, which stuffs up the sgml.  Comment

  drivers/video/fbgen.c has no docs, which stuffs up the sgml.  Comment
@@ -294,11 +294,11 @@ X!Idrivers/video/fbgen.c 
     </sect1>

     </sect1>

KAO -->

KAO -->

     <sect1><title>Frame Buffer Video Mode Database</title>

     <sect1><title>Frame Buffer Video Mode Database</title>

!Idrivers/video/modedb.c

!Idrivers/video/fbdev/core/modedb.c

!Edrivers/video/modedb.c

!Edrivers/video/fbdev/core/modedb.c

     </sect1>

     </sect1>

     <sect1><title>Frame Buffer Macintosh Video Mode Database</title>

     <sect1><title>Frame Buffer Macintosh Video Mode Database</title>

!Edrivers/video/macmodes.c

!Edrivers/video/fbdev/macmodes.c

     </sect1>

     </sect1>

     <sect1><title>Frame Buffer Fonts</title>

     <sect1><title>Frame Buffer Fonts</title>

        <para>

        <para>

Documentation/DocBook/drm.tmpl

+5 −0
Original line number Original line Diff line number Diff line
@@ -2285,6 +2285,11 @@ void intel_crt_init(struct drm_device *dev) 
    <sect2>

    <sect2>

      <title>Modeset Helper Functions Reference</title>

      <title>Modeset Helper Functions Reference</title>

!Edrivers/gpu/drm/drm_crtc_helper.c

!Edrivers/gpu/drm/drm_crtc_helper.c

    </sect2>

    <sect2>

      <title>Output Probing Helper Functions Reference</title>

!Pdrivers/gpu/drm/drm_probe_helper.c output probing helper overview

!Edrivers/gpu/drm/drm_probe_helper.c

    </sect2>

    </sect2>

    <sect2>

    <sect2>

      <title>fbdev Helper Functions Reference</title>

      <title>fbdev Helper Functions Reference</title>

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

0 → 100644
+97 −0
Original line number Original line Diff line number Diff line 
Marvell Kirkwood SoC Family Device Tree Bindings

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



Boards with a SoC of the Marvell Kirkwook family, eg 88f6281



* Required root node properties:

compatible: must contain "marvell,kirkwood"



In addition, the above compatible shall be extended with the specific

SoC. Currently known SoC compatibles are:



"marvell,kirkwood-88f6192"

"marvell,kirkwood-88f6281"

"marvell,kirkwood-88f6282"

"marvell,kirkwood-88f6283"

"marvell,kirkwood-88f6702"

"marvell,kirkwood-98DX4122"



And in addition, the compatible shall be extended with the specific

board. Currently known boards are:



"buffalo,lschlv2"

"buffalo,lsxhl"

"buffalo,lsxl"

"dlink,dns-320"

"dlink,dns-320-a1"

"dlink,dns-325"

"dlink,dns-325-a1"

"dlink,dns-kirkwood"

"excito,b3"

"globalscale,dreamplug-003-ds2001"

"globalscale,guruplug"

"globalscale,guruplug-server-plus"

"globalscale,sheevaplug"

"globalscale,sheevaplug"

"globalscale,sheevaplug-esata"

"globalscale,sheevaplug-esata-rev13"

"iom,iconnect"

"iom,iconnect-1.1"

"iom,ix2-200"

"keymile,km_kirkwood"

"lacie,cloudbox"

"lacie,inetspace_v2"

"lacie,laplug"

"lacie,netspace_lite_v2"

"lacie,netspace_max_v2"

"lacie,netspace_mini_v2"

"lacie,netspace_v2"

"marvell,db-88f6281-bp"

"marvell,db-88f6282-bp"

"marvell,mv88f6281gtw-ge"

"marvell,rd88f6281"

"marvell,rd88f6281"

"marvell,rd88f6281-a0"

"marvell,rd88f6281-a1"

"mpl,cec4"

"mpl,cec4-10"

"netgear,readynas"

"netgear,readynas"

"netgear,readynas-duo-v2"

"netgear,readynas-nv+-v2"

"plathome,openblocks-a6"

"plathome,openblocks-a7"

"raidsonic,ib-nas6210"

"raidsonic,ib-nas6210-b"

"raidsonic,ib-nas6220"

"raidsonic,ib-nas6220-b"

"raidsonic,ib-nas62x0"

"seagate,dockstar"

"seagate,goflexnet"

"synology,ds109"

"synology,ds110jv10"

"synology,ds110jv20"

"synology,ds110jv30"

"synology,ds111"

"synology,ds209"

"synology,ds210jv10"

"synology,ds210jv20"

"synology,ds212"

"synology,ds212jv10"

"synology,ds212jv20"

"synology,ds212pv10"

"synology,ds409"

"synology,ds409slim"

"synology,ds410j"

"synology,ds411"

"synology,ds411j"

"synology,ds411slim"

"synology,ds413jv10"

"synology,rs212"

"synology,rs409"

"synology,rs411"

"synology,rs812"

"usi,topkick"

"usi,topkick-1281P2"

"zyxel,nsa310"

"zyxel,nsa310a"

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+16 −0
Original line number Original line Diff line number Diff line
@@ -13,8 +13,22 @@ ad,ad7414 SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert an 
ad,adm9240		ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems

ad,adm9240		ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems

adi,adt7461		+/-1C TDM Extended Temp Range I.C

adi,adt7461		+/-1C TDM Extended Temp Range I.C

adt7461			+/-1C TDM Extended Temp Range I.C

adt7461			+/-1C TDM Extended Temp Range I.C

adi,adt7473		+/-1C TDM Extended Temp Range I.C

adi,adt7475		+/-1C TDM Extended Temp Range I.C

adi,adt7476		+/-1C TDM Extended Temp Range I.C

adi,adt7490		+/-1C TDM Extended Temp Range I.C

at,24c08		i2c serial eeprom  (24cxx)

at,24c08		i2c serial eeprom  (24cxx)

atmel,24c00		i2c serial eeprom  (24cxx)

atmel,24c01		i2c serial eeprom  (24cxx)

atmel,24c02		i2c serial eeprom  (24cxx)

atmel,24c02		i2c serial eeprom  (24cxx)

atmel,24c04		i2c serial eeprom  (24cxx)

atmel,24c16		i2c serial eeprom  (24cxx)

atmel,24c32		i2c serial eeprom  (24cxx)

atmel,24c64		i2c serial eeprom  (24cxx)

atmel,24c128		i2c serial eeprom  (24cxx)

atmel,24c256		i2c serial eeprom  (24cxx)

atmel,24c512		i2c serial eeprom  (24cxx)

atmel,24c1024		i2c serial eeprom  (24cxx)

atmel,at97sc3204t	i2c trusted platform module (TPM)

atmel,at97sc3204t	i2c trusted platform module (TPM)

capella,cm32181		CM32181: Ambient Light Sensor

capella,cm32181		CM32181: Ambient Light Sensor

catalyst,24c32		i2c serial eeprom

catalyst,24c32		i2c serial eeprom
@@ -46,8 +60,10 @@ maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator 
maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface

maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface

mc,rv3029c2		Real Time Clock Module with I2C-Bus

mc,rv3029c2		Real Time Clock Module with I2C-Bus

national,lm63		Temperature sensor with integrated fan control

national,lm75		I2C TEMP SENSOR

national,lm75		I2C TEMP SENSOR

national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor

national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor

national,lm85		Temperature sensor with integrated fan control

national,lm92		±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface

national,lm92		±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface

nuvoton,npct501		i2c trusted platform module (TPM)

nuvoton,npct501		i2c trusted platform module (TPM)

nxp,pca9556		Octal SMBus and I2C registered interface

nxp,pca9556		Octal SMBus and I2C registered interface