Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits)
  drm/radeon/kms: make sure display hw is disabled when suspending
  drm/vmwgfx: Allow userspace to change default layout. Bump minor.
  drm/vmwgfx: Fix framebuffer modesetting
  drm/vmwgfx: Fix vga save / restore with display topology.
  vgaarb: use MIT license
  vgaarb: convert pr_devel() to pr_debug()
  drm: fix typos in Linux DRM Developer's Guide
  drm/radeon/kms/pm: voltage fixes
  drm/radeon/kms/pm: radeon_set_power_state fixes
  drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+
  drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen
  drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)
  drm/radeon/kms/evergreen: add initial CS parser
  drm/kms: disable/enable poll around switcheroo on/off
  drm/nouveau: fixup confusion over which handle the DSM is hanging off.
  drm/nouveau: attempt to get bios from ACPI v3
  drm/nv50: cast IGP memory location to u64 before shifting
  drm/ttm: Fix ttm_page_alloc.c
  drm/ttm: Fix cached TTM page allocation.
  drm/vmwgfx: Remove some leftover debug messages.
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 7583dc7cf64d..910c923a9b86 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -389,7 +389,7 @@
       </para>
       <para>
         If your driver supports memory management (it should!), you'll
-        need to set that up at load time as well.  How you intialize
+        need to set that up at load time as well.  How you initialize
         it depends on which memory manager you're using, TTM or GEM.
       </para>
       <sect3>
@@ -399,7 +399,7 @@
           aperture space for graphics devices. TTM supports both UMA devices
           and devices with dedicated video RAM (VRAM), i.e. most discrete
           graphics devices.  If your device has dedicated RAM, supporting
-          TTM is desireable.  TTM also integrates tightly with your
+          TTM is desirable.  TTM also integrates tightly with your
           driver specific buffer execution function.  See the radeon
           driver for examples.
         </para>
@@ -443,7 +443,7 @@
           likely eventually calling ttm_bo_global_init and
           ttm_bo_global_release, respectively.  Also like the previous
           object, ttm_global_item_ref is used to create an initial reference
-          count for the TTM, which will call your initalization function.
+          count for the TTM, which will call your initialization function.
         </para>
       </sect3>
       <sect3>
@@ -557,7 +557,7 @@ void intel_crt_init(struct drm_device *dev)
           CRT connector and encoder combination is created.  A device
           specific i2c bus is also created, for fetching EDID data and
           performing monitor detection.  Once the process is complete,
-          the new connector is regsitered with sysfs, to make its
+          the new connector is registered with sysfs, to make its
           properties available to applications.
         </para>
         <sect4>
@@ -581,12 +581,12 @@ void intel_crt_init(struct drm_device *dev)
         <para>
           For each encoder, CRTC and connector, several functions must
           be provided, depending on the object type.  Encoder objects
-          need should provide a DPMS (basically on/off) function, mode fixup
+          need to provide a DPMS (basically on/off) function, mode fixup
           (for converting requested modes into native hardware timings),
           and prepare, set and commit functions for use by the core DRM
           helper functions.  Connector helpers need to provide mode fetch and
           validity functions as well as an encoder matching function for
-          returing an ideal encoder for a given connector.  The core
+          returning an ideal encoder for a given connector.  The core
           connector functions include a DPMS callback, (deprecated)
           save/restore routines, detection, mode probing, property handling,
           and cleanup functions.