commit 55dcfdbbd6a2a4debb717b104c4b54f4a2c76fff
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Tue Jul 28 15:02:37 2009 -0700

    Remove hardcoded gcc -Wall option from configure.ac
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126)

commit 4d349b6c333449517913a5e981b4fc3155da4855
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri Mar 27 15:56:15 2009 -0400

    selinux: Only activate if policy says to be an object manager
    (cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe)

commit d0875154f4f4b751264a2f6781500e97409a499b
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Wed May 27 15:24:34 2009 +1000

    quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4)

commit c941479ecc2dead9c3deaee2620c9b9518c3da9a
Author: Rémi Cardona <remi@gentoo.org>
Date:   Mon Jul 27 12:07:51 2009 +0200

    config: add HAL error checks
    
    This patch simplifies error handling in the HAL code and fixes a
    segfault if libhal_find_device_by_capability() failed.
    
    Fixes http://bugs.gentoo.org/278760
    
    Based on a patch by Martin von Gagern <Martin.vGagern@gmx.net>
    
    Signed-off-by: Rémi Cardona <remi@gentoo.org>
    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c)

commit 546f913ff5461dd93d4a0b29b24d2267557326c7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Fri May 8 21:31:01 2009 -0700

    Don't printf NULL pointers on HAL connection error
    
    Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running
    http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9)

commit 155cb2f9a376d40b699a72ac3bdede71af1b518f
Author: Keith Packard <keithp@keithp.com>
Date:   Sun Jul 26 14:22:35 2009 -0700

    Bump to version 1.6.2.901 (1.6.3 RC1)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 87900645c22d6066fe70190ab838a687808db5c3
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Jun 11 14:21:53 2009 +1000

    xfree86: move didLock assignment down to where the function pointer is valid.
    
    crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so
    it's actually defined before we use it.
    
    Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2.
    
    Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 72c9bc64ff86999a4643663e5699a6547a9e2997
Author: Benjamin Defnet <benjamin.r.defnet@intel.com>
Date:   Wed Jun 10 21:35:48 2009 -0700

    randr: fix operation order so that rotation+transform works
    
    The matrix multiply to combine rotation and projective transforms was being
    done in the wrong order.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit b2bf67b61c564a4b92a429ca9ad455403161f33a)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 7f95d18397757facafcba39e4613b2ed5047c5c4
Author: Benjamin Defnet <benjamin.r.defnet@intel.com>
Date:   Mon Jun 8 21:45:42 2009 -0700

    hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major
    
    This moves code out of each implementation of set_mode_major and back into
    the X server. The real feature here is that the transform is now available
    in the crtc for use by either xf86CrtcRotate or whatever the driver wants to
    do. Without this change, the transform was lost for drivers providing the
    set_mode_major interface.
    
    Note that users of this API will want to stop smashing the transformPresent
    field, and could also stop setting mode/x/y/rotation for new enough X servers,
    but there's no reason to make that change as it will break things when
    running against older X servers.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Acked-by: Daniel Stone <daniel@fooishbar.org>
    (cherry picked from commit 6f59a8160042ea145514fdcb410f17f33fd437c2)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit abc89e2c48a88c29f49fe44d03778deab4b1a3b9
Author: Matthias Hopf <mhopf@suse.de>
Date:   Tue Mar 10 15:49:49 2009 +0100

    randr: Nuke broken set_origin shortcut
    
    Shortcut is impossible to implement this way, because we don't know for sure
    whether the crtc of an output has changed or not.
    (cherry picked from commit cadf65a6e190a8952ad3cc216dc9ea55241de91a)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit b1eed8970f7c5b07152dbc6b7dcc4c8504aeb67c
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri May 22 09:54:38 2009 +0200

    randr: fix server crash in RRGetScreenInfo
    
    We don't return rates to randr < 1.1 clients, so don't allocate space
    for them.  This fixes a FatalError due to not all allocated space being
    used.
    
    X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861>
    
    Reported-by: Guillaume Quintin <coincoin169g@gmail.com>
    Signed-off-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 1addf6fe235f8537024140aff56dffb4738701a7
Author: Keith Packard <keithp@keithp.com>
Date:   Wed Aug 6 15:26:24 2008 -0700

    Replace dixLookupResource by dixLookupResourceBy{Type,Class}
    
    dixLookupResource attempted to automatically detect whether the caller
    wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
    RT_NONE. Instead of trying to make the guess better, this patch just reverts
    the unification and creates separate functions for each operation.
    (cherry picked from commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit c838a03e891a6fcd2f7b71f727c1b93f7c26e7a7
Author: Robert Noland <rnoland@2hip.net>
Date:   Wed Apr 15 12:06:19 2009 -0500

    One = is more than adequate here.  Make is sh safe.
    (cherry picked from commit b3e3154cce47add97f5561088036ce3b9e7dc937)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 68cb38bed65c49716104eeb345c4b1b85a4b15bc
Author: Rémi Cardona <remi@gentoo.org>
Date:   Fri Jul 3 10:51:50 2009 +0200

    configure: libXinerama isn't needed anymore
    
    since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and
    xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the
    server no longer needs libXinerama.
    
    Signed-off-by: Rémi Cardona <remi@gentoo.org>
    (cherry picked from commit 2c69deb92e11542f615df0f24fdc03e3b4415475)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit ec60f4ca65dbc25f9a40636f5280b1a1ec68407f
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Fri Jul 10 20:06:02 2009 +0200

    EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 .
    (cherry picked from commit 35758544813f156eaac28844e693b2a28f6de316)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit b10c4fe343d2339bae4736793939e44a6befaf88
Author: Kim Woelders <kim@woelders.dk>
Date:   Sat Jul 11 18:55:17 2009 +0200

    Fix key repeat problem.
    
    Signed-off-by: Kim Woelders <kim@woelders.dk>

commit 606f6dba16d42e3546a82a386d5a01087467b511
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Apr 14 10:54:25 2009 -0400

    xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)
    
    You could be more clever than this, but the wire protocol says this
    really is an array of not more than 255 ARRAY8, so it's not just a
    matter of changing the types.
    
    (cherry picked from commit 0eb19f9437b7d8c19592e49eedb028771d300d80)

commit 396d3a7762abd0dd84042833b75f2ebf9d100bb0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Jul 8 11:26:46 2009 -0700

    Fix build of drivers with 1.6.2 when not using --install-libxf86config
    
    c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for
    these from the Makefile, but removed a different set than was done in
    master branch, causing xf86Parser.h to not be installed, which in turn
    breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h,
    which includes xf86Parser.h
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 6f1aff5a2b45bc2985081abc240a8fed37170386
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Jul 6 14:08:31 2009 -0700

    Bump to version 1.6.2
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 499f9f62e408510ed4efb6f2321a3f851f535567
Author: Keith Packard <keithp@keithp.com>
Date:   Wed Jul 1 14:01:57 2009 -0700

    dri2: Preserve compatibility with 1.6 DRI2 API/ABI
    
    The old DRI2 buffer allocation API wasn't great, but there's no reason to
    make the server stop working with those drivers. This patch has the
    X server adapting to the API provided by the driver, using the new API where
    available and falling back to the old API as necessary. A warning will be
    placed in the log file when the old API is in use.
    (cherry picked from commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit c859b736d1d23c5dc2f53958b1e76660e6d45018
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date:   Fri Jul 3 11:03:32 2009 +0200

    xfree86: remove duplicate header entries in Makefile.am
    
    fixes https://bugs.freedesktop.org/show_bug.cgi?id=22547
    
    This bug was fixed in a big clean-up commit in master, which cannot be
    backported (see commit b1dac41fb3853ca8182048ea57b88b6e84ecceb3)
    
    Signed-off-by: Rémi Cardona <remi@gentoo.org>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 6f82ca0f8bfc074474407cb5ffe782c3c128f838
Author: Alan Hourihane <alanh@vmware.com>
Date:   Mon Feb 16 11:39:34 2009 +0000

    dri2: support glXWaitGL & glXWaitX by copying fake front to front and
    vice-versa.
    (cherry picked from commit 2a8b8077d8f6001eb57deba60e1009fc99c28668)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit d478bc948838d11b3abcf6d2cdd3a00dccb344c4
Author: Eric Anholt <eric@anholt.net>
Date:   Tue Feb 17 09:59:17 2009 -0800

    xinerama: Put the proto version in the code instead using proto headers.
    
    Proto headers updating resulting in the server advertising new versions is
    broken.  This should be applied to every extension.
    
    This fixes the build against slightly-older xineramaproto.
    (cherry picked from commit b349a764e98f0d8f221190157ffa0904b91beca5)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit a7a93c12f91e0de72868f17a555215f1795d9e2f
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Jun 29 23:18:55 2009 -0700

    Build against DRI_TEX_BUFFER_VERSION 1
    
    setTexBuffer2 isn't present in this version of the structure, so don't try
    to call it.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 5b49aff4f8b5e4d15bc883f74509d93324f09f5f
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Jun 29 14:40:46 2009 -0700

    Bump version to 1.6.1.902
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit e97cabce4abdaf6b83d1a442f7972d4c45979b33
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 25 12:55:42 2009 +1000

    xfree86: fix SWCursor check in xf86CursorSetCursor.
    
    Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when
    the pointer left the screen (in a Xinerama setup).
    We must call the sprite rendering function if
    - SW cursors are enabled, or
    - The current device is not the VCP and not attached to the VCP.
    
    Backported from commit 66089e9129a821cfb1983d3d35f41b975a52de5e for
    server-1.6-branch by Peter Hutterer
    
    Reported-by: Gordon Yuan <GordonYuan@viatech.com.cn>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 17c5b2caf01deec1d1be9fc2ac68a3d636e64c44
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon May 18 19:01:46 2009 +0200

    Change default for ExaOptimizeMigration to false
    
    Quoting Michel Dänzer in <1234862541.4823.541.camel@thor>:
    
      Unfortunately, there are still bugs left in EXA which prevent it from
      working 100% correctly with the option enabled, see
    
      http://bugs.freedesktop.org/show_bug.cgi?id=16416
    
      http://bugs.freedesktop.org/show_bug.cgi?id=19940
    
    So disable it for now to avoid corruption.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 8d65439d5c950ea01ec8e1e4dd989aff0fb4c3f0
Author: Keith Packard <keithp@keithp.com>
Date:   Thu May 28 14:43:27 2009 -0700

    Make RANDR 'set' timestamps follow client specified time. Bug 21987.
    
    The lastSetTime value which indicates when the configuration within the
    server was last changed was not getting set in the appropriate RandR
    requests.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 69a9545d1f8110841538410818df19fd960412c5)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit d98f2792d2f523d7397eac70cc021761e9561219
Author: Federico Mena Quintero <federico@novell.com>
Date:   Tue Jun 9 13:28:28 2009 -0700

    dix/randr: Add missing fields to SRR*NotifyEvent()
    
    Also, remove redundant field swaps and make others match the order in which
    they are declared in the xRR*NotifyEvent structs.
    
    Signed-off-by: Federico Mena Quintero <federico@novell.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit e244a5991e2cc55f5aa2f6e5255f1dabf56f0235)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit f697b6c582095aa1eec3244fa05835922249425b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon May 11 12:53:56 2009 +1000

    kdrive: set Activate/Deactivate grab for input devices (#21591)
    
    X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
    (cherry picked from commit b1b5ec45c1cb650ccb8c659218f9481379c777d9)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit c91accd173b5f17af771bd9f4e60b5860af15718
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon May 11 12:51:40 2009 +1000

    dix: ensure Activate/DeactivateGrab has a valid value.
    
    Xephyr doesn't manually set Activate/DeactivateGrab for new devices,
    resulting in a NULL-pointer dereference later when a grab is activated.
    Avoid the segfault by ensuring that the pointer is always valid.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 6f9e22049862ee9ac7f604411d005d8bb1b2dd1c)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit bd94c7c986aed4496cd4e8141bb30c3e4412f1f4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Tue May 12 16:11:01 2009 -0700

    Resync COPYING file with notices in code base as of xorg-server-1.6.1
    
    Remove notices for code no longer in tree (Xprint, Xgl, kdrive, cfb, etc.)
    Add/update notices for new/changed code in tree
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    (cherry picked from commit b746a00cffca5c553b607a8e9c1074294a23b443)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 597747c6551cd67487069415297e5eb441038321
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date:   Sat May 9 11:42:17 2009 -0700

    Fix a couple off-by-one array boundary checks.
    
    Error: Write outside array bounds at Xext/geext.c:406
            in function 'GEWindowSetMask' [Symbolic analysis]
           In array dereference of cli->nextSib[extension] with index 'extension'
           Array size is 128 elements (of 4 bytes each), index <= 128
    
    Error: Buffer overflow at dix/events.c:592
    	in function 'SetMaskForEvent' [Symbolic analysis]
           In array dereference of filters[deviceid] with index 'deviceid'
           Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20
    
    Error: Read buffer overflow at hw/xfree86/loader/loader.c:226
    	in function 'LoaderOpen' [Symbolic analysis]
           In array dereference of refCount[new_handle] with index 'new_handle'
           Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256
    
    These bugs were found using the Parfait source code analysis tool.
    For more information see http://research.sun.com/projects/parfait
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit b680bda34da130ce408783f04214771471e41e8d)
    (cherry picked from commit 04c9e80f083659e63cffec8969fb3a0cfc551a97)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 10c06ddeefccc195e70adfed664e9488eeb53804
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Apr 9 15:40:24 2009 +1000

    xfree86: restore default off for DontZap
    
    Zapping is triggered by xkb these days, so note in the man page that it's the
    Terminate_Server action. Since it's XKB, personal preferences towards or
    against zapping should be achieved through xkb rulesets.
    If Terminate_Server is not in the xkb actions, then we can't zap anyway and we
    don't need a default of DontZap "on".
    
    This patch restores the old meaning of DontZap - disallow zapping altogether,
    regardless of XKB's current keymap.
    Ideally, this patch should be accompanied by b0f64bdab00db652e in
    xkeyboard-config.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 737b49199a05299486064e6e762cf2a2f6f95be6)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 966349f8e068fa120470549b0db9a8fcf88aca5b
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Fri May 15 15:48:37 2009 +0200

    EXA: Always damage glyph cache pixmap manually after uploading a glyph.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    (cherry picked from commit 7c8327f0a75087a85864256a9cea80dd4b86def5)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit cc5e4b632aa99623ff577776039287c5950d921d
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Fri May 15 15:48:37 2009 +0200

    EXA: Take GC client clip type into account for migration.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18950 .
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    (cherry picked from commit 850675d4de4373e5df95507dbf2cd9affaaf54bc)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit bbe0be1e459b0d5810a0e7b916cc890c440a4e21
Author: Tomas Janousek <tomi@nomi.cz>
Date:   Wed May 20 15:03:01 2009 +0200

    Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.
    
    In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and
    .totalVModMapKeys were not initialized, contained random values and caused
    accesses to unallocated and later modified memory, causing
    XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of
    nonzero values, resulting in writes past the end of an array in XkbSendMap.
    
    This patch initializes those values sensibly and reverts commits 5c0a2088 and
    6dd4fc46, which have been plain non-sense.
    
    Signed-off-by: Tomas Janousek <tomi@nomi.cz>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 525aa17f804d37d1cfcbbf6b8e6cddb45e999b20)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 6056d429e7dcc37fe706dd7bc8d3429fdb635e14
Author: Kristian Høgsberg <krh@redhat.com>
Date:   Wed Apr 1 17:42:33 2009 -0400

    Support setTexBuffer2 in AIGLX.
    
    Fixes broken GLX_tfp, specifically, lets compositors ignore un-defined
    alpha channel for pixmaps.
    (cherry picked from commit 91b697efdefba125348dbcaf584ee51a7f8c9bf6)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 7cae08d21952b02ef664641af6588ef6bd727bf8
Author: Adam Jackson <ajax@redhat.com>
Date:   Mon Jun 29 11:16:16 2009 -0400

    EDID: Fix timing class names to match the spec
    (cherry picked from commit 5c1afac5eea1d8327c74342d12d082b75f0cebde)

commit dbac41b624e4aa86a6a184b7ebb52bfdd367bbf0
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri Jun 19 12:42:07 2009 -0400

    pci: Dump vendor/devices ids in the printed device list
    (cherry picked from commit eb35402d0a5290e8a73d7d1e92f173294c364cc2)

commit 6be19e8f43086fb4b7fb30a47b89b5f3eed798ef
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Wed Apr 8 14:54:30 2009 -0700

    Use a #define instead of a magic number
    
    The number of buffers is likely to change in the future, so having
    this as a define is the right way to go.
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit 03aebed519986c4dd03e02b3b3d4af1f64595ca7)

commit 540d5b87a4e24d85ec46620dfedd7bd7979180ea
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Mon May 11 22:52:46 2009 +0200

    DRI2: update DRI2 private drawable width & height according to X drawable
    (cherry picked from commit f250eea2e90fc50bec5214c2f41132b95edc2c46)

commit ec9f1ae32474bc0507a3c66e63bdf2835d467a34
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Mon Apr 27 15:11:10 2009 -0700

    DRI2: Force allocation of real-front buffer for non-windows as well
    
    For redirected rendering we end up with pixmaps (which the app thinks are
    windows) that are double buffered.
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    Tested-by: Pierre Willenbrock <pierre@pirsoft.de>
    (cherry picked from commit 0d9d3f3e361f769822caedccf4c2a58cc9930ecc)

commit 4fad615d689c61c6c3a000295a1fa755359737cb
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Fri Apr 24 12:49:19 2009 -0700

    DRI2: Implement protocol for DRI2GetBuffersWithFormat
    
    This change implements the protocol for DRI2GetBuffersWithFormat, but
    the bulk of the differences are the changes to the extension / driver
    interface to make this function work.  The old CreateBuffers and
    DeleteBuffers routines are replaced with CreateBuffer and DeleteBuffer
    (both singular).
    
    This allows drivers to allocate buffers for a drawable one at a time.
    As a result, 3D drivers can now allocate the (fake) front-buffer for a
    window only when it is needed.  Since 3D drivers only ask for the
    front-buffer on demand, the real front-buffer is always created.  This
    allows CopyRegion impelemenations of SwapBuffers to continue working.
    As with previous version of this code, if the client asks for the
    front-buffer for a window, we instead give it the fake front-buffer.
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    Reviewed-by: Kristian Høgsberg <krh@redhat.com>

commit 98c3c21735197fbd2c8166c9bdabf055e14c9009
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Fri Apr 24 12:09:21 2009 -0700

    DRI2: Add interface for drivers to query DRI2 extension version
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit 28ddfc88d8d547941c7f4713db527a3c2f9ec35a)

commit 4cb4c210c365fd40ad314e0707eb38811f240a12
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Thu Apr 16 12:10:34 2009 -0700

    DRI2: Add missing front-buffer flush callback.
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit d1e916d29be8b470cbc8cadcf6e83991fdbc5a9f)

commit aa13faef2b1464f808e04de9826c6b8b8b91ae89
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Wed Apr 15 11:13:48 2009 -0700

    DRI2: Don't leave empty entries in private->buffers
    
    This should fix bug #21130.
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit de1e43181bd670877b994db221ad8a04b5d63324)

commit d7277296ed7aea7bd41b3489d4ceef750d400206
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Thu Apr 9 14:38:24 2009 -0700

    DRI2: Synchronize the contents of the real and fake front-buffers
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit 567cf67959b30432ae30f4851ec17b3a375ab838)

commit 73b786f7e7f46d40bf3b039538540c2e25f45947
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Thu Apr 9 14:31:01 2009 -0700

    DRI2: Do not send the real front buffer of a window to the client
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit f1a995d1496d73741731e32f475097c44a8da972)

commit 32d250a881341ece8a1f1d78359adc1b265b5174
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Wed Apr 8 15:44:34 2009 -0700

    DRI2: Add fake front-buffer to request list for windows
    
    If a front-buffer is requested for a window, add the fake front-buffer
    to the list of requested buffers.
    
    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
    (cherry picked from commit aa2928325fe51d94a636dde9c090e8f54a311a12)

commit db61eff891675aeaf2466c3529424de4621005dc
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri May 22 12:01:55 2009 -0400

    EDID: Add modes from Established Timings III descriptor to mode pool
    
    EDID 1.4, section 3.10.3.9
    (cherry picked from commit 99e22b86c5f1a3653f3caaf01368a777d2b208d0)

commit ebca49e0fedcc1c536f1dee7c58cae9903e74fa2
Author: Adam Jackson <ajax@redhat.com>
Date:   Thu May 21 10:20:48 2009 -0400

    EDID: Be more cautious about finding vendor blocks.
    
    Many old monitors zero-fill the detailed descriptors, so check for that
    to avoid a useless warning like:
    
    (WW) RADEON(0): Unknown vendor-specific block 0
    (cherry picked from commit a2c5ee36b21c2ee5c0468f1b251e74c1412dbecb)

commit c643d24cdeaade8d7839691a3113c4d2d17be61e
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri May 29 18:07:48 2009 -0400

    vfb: Fix depth setup.
    
    Initialize the depth corresponding to the root window before the
    pixmap-only depths.  Otherwise you end up with the root window depth in
    the depth list twice, which is mildly confusing for clients and
    catastrophically confusing for PanoramiXConsolidate().
    (cherry picked from commit 45530d16097459a756696e255ab4e72d6e51fbc4)

commit 5cd5a01259ba349f1868ca4af04207cf120d69e4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date:   Tue May 19 19:30:33 2009 -0400

    xace: Fix a bad device access hook call.
    
    Add a proper access mode, and reverse the logic of the return value.
    Zero ("Success") is returned on success from the hook calls.
    
    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
    (cherry picked from commit 3cea176d5abcb0f14eefbdcbe17fed0847524dd4)

commit a9f85dcefbadfe44d8c58ad08430aaadb8c59d34
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date:   Mon May 11 15:27:46 2009 -0400

    xselinux: Relax ownership restriction on SetSelectionUseContext.
    
    Instead, clients should keep track of the selection instances they use.
    (cherry picked from commit 0952d12717031e9dda9e48123bb922d0f4e81834)
    
    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>

commit 0fbf6f30f771e60714fb3003a9bb1a6b79e50c6e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Mar 26 22:22:32 2009 -0700

    Don't leak default font path when appending built-ins
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    (cherry picked from commit 66539cc05d0b017b9feb4a038499907810140623)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 773e4890b385a229b0919b4a249714d0bb7171a2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Mar 26 22:25:08 2009 -0700

    Don't leak canonical module name and patterns if module is built-in
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 1c101d75d4855b2698e3fc8d2dd662f20585812f)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 21f58a2b0d0d96492d2d7c7de1bd654ed0114279
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed May 6 16:55:32 2009 +1000

    Xi: don't double-swap the XListDeviceProperties reply.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 50cc8adafca4ba3838d468278d6eb8a4692d2488)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit b575af88d0e547a03b164f6f3b2d4b268b9ffc34
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed May 6 22:25:28 2009 +1000

    Xi: fix copy/paste error causing sizeof against wrong struct.
    
    This wrong check may cause BadLength to be returned to the client even if the
    length is correct.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 8b583ca2b21155359c6255f406c96599b277c762)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 9c643b1e3ddc4ec9f1a924bd25f24df8536c7ea6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Apr 16 16:17:07 2009 +1000

    os: don't malloc memory in LogVMessageVerb.
    
    LogVWrite is limited to a buffer size of 1024, so we don't loose anything here
    by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends)
    during signal handlers with the normal message types.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Acked-by: Alan Coopersmith <alan.coopersmith@sun.com>
    (cherry picked from commit 0e0642ee9466d3268476d0084a83a9d93a4aa555)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 7cd596e0dd6b9c195d7e395c26bfb00ef544c525
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Apr 15 18:26:06 2009 +1000

    randr12: looking up these bits if randr isn't initialised is bad.
    
    When xinerama is enabled we don't get randr protocol, but the
    driver might still want randr internals
    (cherry picked from commit faf7dfa099f5b42a703313fbd1bf8afdad07a179)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit bc95f29441b3daa7b9d91bd3c2b3e502a3a8cc81
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Apr 23 08:42:38 2009 -0700

    Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
    
    Fixes OpenSolaris Bug 8315:
    Xorg segfaults when screensaver fades in cross-endian xdmcp session
    <http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    (cherry picked from commit 7d0f7518c2235a9dc783029971259ddaada2db20)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 3f0c73694b9ddc85b82a7a82a5d98fa8b18a01a8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Thu Feb 12 16:03:16 2009 +0000

    Remove references to rgb.txt from files section of Xserver and Xorg man pages
    
    The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f
    
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    (cherry picked from commit d0dd649035fc3698c5b436f9d9d248116aa106a3)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 78eb366c65a953bbc059a989a92dfe28fbe1ae29
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Thu Feb 12 16:02:17 2009 +0000

    Remove long-gone '-co' option from Xserver man page
    
    The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f
    
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    (cherry picked from commit b0ad9e1ced9619f37acf77764c395c57b86cf463)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 31536307703fcffa14a027ec777310c9962f816c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Sat May 2 00:26:18 2009 -0700

    XkbSetNamedIndicator should ignore SD's without LED's
    
    When ProcXkbSetNamedIndicator is called on a core device, and we
    walk the slaves to set the LED's on each of them, ignore any slaves
    that do not have either a KbdFeedbackCtrl or LedCtrl structure.
    
    (This is much more critical in xserver-1.5-branch, where we walk
     *all* devices, not just the slaves of the specified master, and
     thus return failure when setting an LED on the Core Keyboard and
     hit a xf86-input-mouse device with no LED's to set.)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 01f0210b2ba34f724aa221bbe6b567a5751781a6
Author: Keith Packard <keithp@keithp.com>
Date:   Fri May 8 22:29:15 2009 -0700

    xserver 1.6.1.901
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit e21c9949ac456ba9b162b6244a17e68c5b8112a9
Author: Pierre Ossman <pierre@ossman.eu>
Date:   Tue Apr 28 09:34:55 2009 +0200

    dix: fix calculation of number of fake KeyRelease events
    
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 3b1ff33587458bad45777b8eb74b81c3e55987ad
Author: Pierre Ossman <pierre@ossman.eu>
Date:   Tue Apr 28 12:29:07 2009 +0200

    Xi: don't send XKB mapping notifications when XKB is disabled
    
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 4b702526dec35f5cfe5c6baec6a77c02c95c2867
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 25 13:08:27 2009 +1000

    dix: ignore non-pointer events in XineramaCheckMotion (#20557)
    
    Note that deviceKeyButtonPointer and keyButtonPointer have the same wire
    layout, so we only need to check for event types.
    
    X.Org Bug 20557 <http://bugs.freedesktop.org/show_bug.cgi?id=20557>
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit fdbb6fd3d3c0ce7078f8faaf089af51cc36cbcb3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon May 4 15:38:22 2009 -0700

    Don't prepare outputs & crtcs if set_mode_major is present
    
    A driver with this hook will take care of preparing the outputs & crtcs,
    so calling the prepare functions will just cause unnecessary flicker.
    
    Fixes bug #21077
    (cherry picked from commit 94648bb797d94b025746c60679c584e5be2fae28)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit eac2b3658aacc8a64dc3c0fd7cc8fd77abcc59af
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 22 20:01:49 2009 +0200

    Bug#21324: Add quirk for Iiyama Vision Master 450
    
    Reported-by: Jeremy Henty <onepoint@starurchin.org>
    Signed-off-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit 0dfb97f15f591f85e079f5829c77d0c328d00464)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit b3c42e6450b0af97ead4f410983c803a959e1d04
Author: Tormod Volden <debian.tormod@gmail.com>
Date:   Wed Apr 1 19:32:21 2009 +0200

    xfree86: edid quirk for Philips LCD LP154W01-TLAJ
    
    This panel reports its vertical size in cm.
    
    X.Org bug#21000 <http://bugs.freedesktop.org/show_bug.cgi?id=21000>
    
    Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
    Signed-off-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit b1dab580bdfb4acfe3feddeda6e760098ec4922a)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 96eede556ac9f95204fa54287f74794acdbf3a2b
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Dec 24 14:17:27 2008 +0100

    Add RandR 1.3 requests to protocol.txt
    (cherry picked from commit 4f86ee61a4abf7a29e565d095aa08abd0ca9dc66)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit b7b520e3a93fde5579c48eabb9b8c694a7dfbcb1
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Dec 24 14:23:37 2008 +0100

    Add XI 1.5 event and requests to protocol.txt
    (cherry picked from commit 063833f3a6d9f8f657e3de309c8d6d5c3d606513)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 0df12a3f01c953c0908b4b53a93fd3a5c704f69b
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date:   Mon Apr 6 16:01:20 2009 -0300

    xfree86: Remove device from inputInfo.devices if ActivateDevice failed.
    
    After the call to xf86ActivateDevice, the new device will be added to
    inputInfo.devices. However, if the subsequent call to ActivateDevice
    fails, the correponding InputInfoRec for the device is deleted but an
    entry still remains in inputInfo.devices. This might lead to a server
    crash later on (on InitAndStartDevices for instance) when the device
    control proc would be called for an invalid device.
    (cherry picked from commit efa31092d6703397121a0ada4f7205a8ecad3d3d)
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 24dc7694a2ba72d45cda7720aeaec8350930edc3
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Fri Feb 6 11:37:53 2009 +0100

    EXA: Guard empty pending region warning by DEBUG_MIGRATE.
    
    It isn't very useful yet while the damage layer calls us for empty operations,
    mostly confuses users.
    (cherry picked from commit 3948b523893d3d44b6a088340c4252e969613769)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 5198ff6f86e4796819c0d1f742de57a69228c93b
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Fri Feb 27 16:37:28 2009 +0100

    EXA: Handle separate alpha maps properly in Composite fallback, take two.
    
    Preserve the EXA ABI by introducing a new driver flag EXA_SUPPORTS_PREPARE_AUX.
    If the driver doesn't set this flag, we have to assume any Prepare/FinishAccess
    driver hooks can't handle the EXA_PREPARE_AUX* indices, so we move out such
    pixmaps at PrepareAccess time.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18710 .
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    (cherry picked from commit 4cfb36f6ad2df01215028fec48d99239a0e4496b)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

commit 199bb367152d68e784dfbec79ab9b70540d83fc2
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Mon Apr 20 18:20:52 2009 -0700
