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

Commit fced6dee authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

parents bfed1074 be1f7c8d

.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/arch_timer.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs. 




- clock-frequency : The frequency of the main counter, in Hz. Optional.

- clock-frequency : The frequency of the main counter, in Hz. Optional.





- always-on : a boolean property. If present, the timer is powered through an

  always-on power domain, therefore it never loses context.



Example:

Example:





	timer {

	timer {

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"