xserver: Branch 'master'

[Jesse Barnes]

 exa/exa.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 1b3a0508a7aee1c7b14cd62216b4727fcc9181d4 (from 030a578391c634bc68add6ada3f251cf3f8c3069)
Author: Jesse Barnes <jbarnes at jbarnes-mobile.amr.corp.intel.com>
Date:   Sun May 6 01:30:59 2007 -0700

    Fix documentation for Copy hook -- it can copy memory to the scanout
    buffer too.

diff --git a/exa/exa.h b/exa/exa.h
index 6c39a8f..cd90bbc 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -229,7 +229,7 @@ typedef struct _ExaDriver {
      * @{
      */
     /**
-     * PrepareCopy() sets up the driver for doing a copy within offscreen
+     * PrepareCopy() sets up the driver for doing a copy within video 
      * memory.
      *
      * @param pSrcPixmap source pixmap