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

Commit 7acdbb3f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into x86/platform 



Reason: Import mainline device tree changes on which further patches
        depend on or conflict.

Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 695884fb f5412be5

Documentation/DocBook/drm.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
      services.

    </para>

    <para>

      The core of every DRM driver is struct drm_device.  Drivers

      will typically statically initialize a drm_device structure,

      The core of every DRM driver is struct drm_driver.  Drivers

      will typically statically initialize a drm_driver structure,

      then pass it to drm_init() at load time.

    </para>
@@ -84,7 +84,7 @@ 
    <title>Driver initialization</title>

    <para>

      Before calling the DRM initialization routines, the driver must

      first create and fill out a struct drm_device structure.

      first create and fill out a struct drm_driver structure.

    </para>

    <programlisting>

      static struct drm_driver driver = {

Documentation/DocBook/filesystems.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ 
     </sect1>

  </chapter>



  <chapter id="fs_events">

     <title>Events based on file descriptors</title>

!Efs/eventfd.c

  </chapter>



  <chapter id="sysfs">

     <title>The Filesystem for Exporting Kernel Objects</title>

!Efs/sysfs/file.c