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

Commit 9c3c8afc authored by Grant Likely's avatar Grant Likely
Browse files

Merge commit 'v2.6.38-rc8' into spi/next 

Conflicts:
	drivers/spi/pxa2xx_spi_pci.c
parents 290293ed a5abba98

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.gz

*.bz2

*.bz2

*.lzma

*.lzma

*.xz

*.lzo

*.lzo

*.patch

*.patch

*.gcno

*.gcno

Documentation/DocBook/drm.tmpl

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

      services.

    </para>

    </para>

    <para>

    <para>

      The core of every DRM driver is struct drm_device.  Drivers

      The core of every DRM driver is struct drm_driver.  Drivers

      will typically statically initialize a drm_device structure,

      will typically statically initialize a drm_driver structure,

      then pass it to drm_init() at load time.

      then pass it to drm_init() at load time.

    </para>

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

    <title>Driver initialization</title>

    <para>

    <para>

      Before calling the DRM initialization routines, the driver must

      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>

    </para>

    <programlisting>

    <programlisting>

      static struct drm_driver driver = {

      static struct drm_driver driver = {

Documentation/DocBook/filesystems.tmpl

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

     </sect1>

  </chapter>

  </chapter>





  <chapter id="fs_events">

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

!Efs/eventfd.c

  </chapter>



  <chapter id="sysfs">

  <chapter id="sysfs">

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

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

!Efs/sysfs/file.c

!Efs/sysfs/file.c