Commit c0981b86 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile',... 

Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd', 'arm/exynos', 'arm/renesas', 'ppc/pamu' and 'arm/msm' into next
parents 286f600b 645d6c87 9db4241e 3dbc2608 365409db 720b0cef d6a71bf7 afba256b

.mailmap

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

Sascha Hauer <s.hauer@pengutronix.de>

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>

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

Stephen Hemminger <shemminger@osdl.org>

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

Documentation/DocBook/device-drivers.tmpl

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



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

!Edrivers/video/fbmem.c

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

     </sect1>

<!--

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

-->

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

!Edrivers/video/fbcmap.c

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

     </sect1>

<!-- FIXME:

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

KAO -->

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

!Idrivers/video/modedb.c

!Edrivers/video/modedb.c

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

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

     </sect1>

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

!Edrivers/video/macmodes.c

!Edrivers/video/fbdev/macmodes.c

     </sect1>

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

        <para>

Documentation/DocBook/drm.tmpl

+11 −6
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
  <partintro>

    <para>

      This first part of the DRM Developer's Guide documents core DRM code,

      helper libraries for writting drivers and generic userspace interfaces

      helper libraries for writing drivers and generic userspace interfaces

      exposed by DRM drivers.

    </para>

  </partintro>
@@ -459,7 +459,7 @@ char *date;</synopsis> 
      providing a solution to every graphics memory-related problems, GEM

      identified common code between drivers and created a support library to

      share it. GEM has simpler initialization and execution requirements than

      TTM, but has no video RAM management capabitilies and is thus limited to

      TTM, but has no video RAM management capabilities and is thus limited to

      UMA devices.

    </para>

    <sect2>
@@ -889,7 +889,7 @@ int (*prime_fd_to_handle)(struct drm_device *dev, 
	    vice versa. Drivers must use the kernel dma-buf buffer sharing framework

	    to manage the PRIME file descriptors. Similar to the mode setting

	    API PRIME is agnostic to the underlying buffer object manager, as

	    long as handles are 32bit unsinged integers.

	    long as handles are 32bit unsigned integers.

	  </para>

	  <para>

	    While non-GEM drivers must implement the operations themselves, GEM
@@ -2285,6 +2285,11 @@ void intel_crt_init(struct drm_device *dev) 
    <sect2>

      <title>Modeset Helper Functions Reference</title>

!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>

      <title>fbdev Helper Functions Reference</title>
@@ -2351,7 +2356,7 @@ void intel_crt_init(struct drm_device *dev) 
      first create properties and then create and associate individual instances

      of those properties to objects. A property can be instantiated multiple

      times and associated with different objects. Values are stored in property

      instances, and all other property information are stored in the propery

      instances, and all other property information are stored in the property

      and shared between all instances of the property.

    </para>

    <para>
@@ -2692,10 +2697,10 @@ int num_ioctls;</synopsis> 
  <sect1>

    <title>Legacy Support Code</title>

    <para>

      The section very brievely covers some of the old legacy support code which

      The section very briefly covers some of the old legacy support code which

      is only used by old DRM drivers which have done a so-called shadow-attach

      to the underlying device instead of registering as a real driver. This

      also includes some of the old generic buffer mangement and command

      also includes some of the old generic buffer management and command

      submission code. Do not use any of this in new and modern drivers.

    </para>

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@