Added xorg-server-1.6.2.tar.gz

1 files changed, 18239 insertions, 1545 deletions

diff --git a/xorg-server/ChangeLog b/xorg-server/ChangeLog
index f6c1ee4ff..af04eecf6 100644
--- a/xorg-server/ChangeLog
+++ b/xorg-server/ChangeLog
@@ -1,38 +1,4956 @@
-commit b0c2d009852972f1b085ab5ce2271692dface27f
+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:   Sun Oct 26 13:13:21 2008 +0100
+Date:   Mon May 18 19:01:46 2009 +0200
 
-    xfree86: fix compiler warnings in DoModalias()
+    Change default for ExaOptimizeMigration to false
     
-    The precedence of == is higher than that of &, so that code was
-    probably buggy.
+    Quoting Michel Dänzer in <1234862541.4823.541.camel@thor>:
     
-    xf86Init.c: In function 'DoModalias':
-    xf86Init.c:300: warning: suggest parentheses around comparison in operand of &
-    xf86Init.c:304: warning: suggest parentheses around comparison in operand of &
-    xf86Init.c:308: warning: suggest parentheses around comparison in operand of &
-    (cherry picked from commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0)
+      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 a311fdc04013c678eb506458d6a5d3376f107bf7
-Author: Nathaniel McCallum <nathaniel@natemccallum.com>
-Date:   Tue Oct 14 09:50:29 2008 -0400
+commit 8d65439d5c950ea01ec8e1e4dd989aff0fb4c3f0
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu May 28 14:43:27 2009 -0700
 
-    Xorg: add -modalias option
+    Make RANDR 'set' timestamps follow client specified time. Bug 21987.
     
-    This scans the installed video drivers and prints a Linux-style modalias
-    listing of the devices each driver claims to support.
+    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
+
+    DRI2: Send the version the code actually supports
+    
+    This prevents building an older server with a new dri2proto.h from
+    resulting in a DRI2 extension module that lies about the version it
+    supports.
+    
+    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+    (cherry picked from commit 44227ef1b77467c76147b9bf79bdd0e6305a522a)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 11db545a86c8933c638a0bc1fcd4f2c65279f617
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Apr 16 22:48:11 2009 -0400
+
+    security: Grant untrusted windows remove access on all windows.
+    
+    This allows untrusted clients to destroy their own windows when they
+    have been reparented by a trusted window manager.
+    (cherry picked from commit 4559d2ace6ac55fe361f572ded0769cdd1f3b545)
+
+commit 5d48f288eccb57dfe1751946c9d60dbd3ac0129a
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Apr 16 22:39:54 2009 -0400
+
+    security: Fix a crash caused by wrong ordering of format arguments.
+    (cherry picked from commit 3481b32ab971c41cb972f6819ae049f3e9f7033b)
+
+commit 93e0a648138e569087fc6e07c1a28abfa92a4dde
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Apr 16 22:33:12 2009 -0400
+
+    security: Revert behavior of extension access for compatibility.
+    
+    Previously, three extensions were defined as "trusted" by the extension:
+    BIG-REQUESTS, XC-MISC, and XPrint.  No other extensions were permitted
+    to be used by untrusted clients.
+    
+    In commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 this was changed for
+    some reason.  Return to the old, compatible behavior.
+    (cherry picked from commit 6045506be0cebca4ebbe943ae77f020aafa703d4)
+
+commit cd321badf0c185854b3e0c038f3851a3ac7864ea
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Apr 14 16:08:11 2009 -0400
+
+    xserver 1.6.1
+
+commit fcffa3a178683ede0d15656c432fccf23ebca5ef
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Mar 25 15:51:43 2009 +1000
+
+    Xext: set POINTER_SCREEN flag in XTestFakeInput if necessary. (RH #490984)
+    
+    The POINTER_SCREEN flag must be set explicitly for XTest core events to avoid
+    out-of-range events when the lastSlave was an SD with an explicit axis range.
+    Device events sent through XTest don't need this flag, they are expected to be
+    in the valuator range of the device anyway.
+    
+    Red Hat Bug 490984 <https://bugzilla.redhat.com/show_bug.cgi?id=490984>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 603db34337a61754e0c5f71525011d10eab78411)
+
+commit 6ff60c626141771b365d557fe64bc93f200d1c9c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Apr 9 13:16:37 2009 -0400
+
+    glx: Fix drawable private leak on destroy
+    
+    When a drawable goes away, we don't destroy the GLX drawable in full,
+    since it may be current for a context.  This means that when the drawable
+    is destroyed in full later, the backend doesn't get a chance to
+    destroy resources associated with the drawable (the DRI2Drawable).
+    
+    With this patch, we destroy the GLX drawable in full when it goes away
+    and then track down all contexts that reference it and NULL their
+    pointers.
+    
+    (cherry picked from commit 7b6400a1b8d2f228fcbedf17c30a7e3924e4dd2a)
+
+commit 50894e13545538ed93f20823f7ba81d1ab8906bb
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Apr 9 02:48:04 2009 -0400
+
+    xselinux: Don't BadAlloc in List* requests if there are no items to list.
+    (cherry picked from commit 682d7b55699cacbb2dbcd84a5e816bf6e2d2f02a)
+
+commit feb01d7d6e98fa77f9069b08aaa9727368ef3aaf
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Wed Apr 8 15:10:16 2009 -0400
+
+    xselinux: Don't require incoming context strings to be null-terminated.
+    (cherry picked from commit e8b324102f6e21ae2b8292a6f50d016dd6254dd6)
+
+commit b7dc7374bbcb708eee6eec26ff141619f914d8eb
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Mon Mar 9 17:28:40 2009 -0400
+
+    Correct access mode in call to dixLookupWindow() within RRSelectInput.
+    
+    Reported by Alan Coopersmith.
+    (cherry picked from commit 6544490700051b3b5e88ac1890d71b35634c9100)
+
+commit 38b0f9edca80e43b4c8c364cfebc25c835d24cbd
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Mar 27 16:49:45 2009 -0400
+
+    Fix distcheck with dolt
+
+commit 509986d6f0255588f37446173ea76640895c9886
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Mar 27 16:28:26 2009 -0400
+
+    Fix Changelog generation
+
+commit 0f9fd02dacf4363c0efd69825bc804bfb55599bf
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Mar 16 13:24:48 2009 -0400
+
+    selinux: Add support for avc_acquire_netlink_fd()
+    
+    Requires libselinux 2.0.79 or newer.  Without this, libselinux will
+    check for policy updates on the netlink socket on basically every policy
+    lookup.  Statistically speaking, they never happen, and the check
+    translates to at least one more syscall on basically every operation.
+    
+    Instead, take control of the fd from the library, and check it in
+    WakeupHandler if it polls readable.
+    (cherry picked from commit 3992dd38caf33b343affd8d732c94880d1099dcf)
+
+commit b3484c848040ae29b8ca1327d3b142db30c38387
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Feb 21 19:56:20 2009 -0500
+
+    selinux: Don't bother relabeling resources that are being destroyed
+    
+    Makes window destroy about 40x faster in Xvfb.
+    (cherry picked from commit b030f858f2f1ce1fd27a73ebf7f9ec5db541a668)
+
+commit 08ac9140f6042ce3faa618613fc8443c92924a21
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Feb 13 09:56:22 2009 +1000
+
+    xkb: Fix wrong colour reference in XKB geometry copying. #20081
+    
+    base_color and label_color need to reference the color in the destination, not
+    in the source.
+    
+    X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    (cherry picked from commit f5bf1fdaf36163d5c2f1b9b51df96326ebbb0e9c)
+
+commit 124da1da5cd3ac85edd7f0e30f61ee842d49a6a4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Mar 9 08:59:01 2009 +1000
+
+    Xi: don't crash on a NULL property name, just return None.
+    
+    strcmp doesn't like NULL-pointers.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 0d9a42dc0380d1583889b6b6521bd5a2451735d4)
+
+commit ea9f51fd42ae0285aed707b7efa44c558dad4e4b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Dec 5 16:24:57 2008 +1000
+
+    Xi: add XATOM_FLOAT to server-defined properties.
+    
+    This property is used to denote type float for input properties. Such
+    properties can be accessed easily through the XIPropToFloat() function.
+    
+    Code originally written by Simon Thum.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit a48c81dcdf569a3f634ac23e08d2491354de6a36)
+
+commit 6ad6b6f900e9c3a55e4ee509bdc9ff0ddec9a59a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 19 15:50:57 2008 +1000
+
+    Xi: add XIPropToInt() auxiliary function.
+    
+    Converts an XIPropertyValuePtr to an integer, provided that type and format is
+    right.
+    
+    Code originally written by Simon Thum.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit 669f6810af9a89187d6149841925fe765f3988ff)
+
+commit 667865b9eb98ed73461028b3d38be19619712533
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Mar 2 14:26:23 2009 -0500
+
+    randr: Fix thinko in xf86TargetPreferred
+    
+    The only-one-output case would only work right if that also happened to
+    be the zeroth output.  Oops.
+    (cherry picked from commit 8a6ed44a8b2fc5f14729dc54fec17607ced03859)
+
+commit f469726fec502ce29999eda6919c3c3d26c127d8
+Author: Eric Paris <eparis@redhat.com>
+Date:   Tue Mar 3 13:15:39 2009 -0500
+
+    This patch changes all places in the X code to use _raw functions.  The
+    X server should never see, translate, or deal with a munged context.
+    Display managers which show contexts to the user should take care of
+    translating these to human readable form.
+    (cherry picked from commit c7cf926d25523d5d0d8e5c83671c901660070d71)
+
+commit 60c161545af80eb78eb790a05bde79409dfdf16e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Feb 25 12:05:44 2009 -0800
+
+    X server version 1.6.0
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e9a9f807971b8fb62b957c9d54b4aea7fb0f96ca
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Jan 30 19:32:33 2009 +0100
+
+    exa: kill of exaImageGlyphBlt
+    
+    - It serves no obvious purpose, yet it directly accesses many fb
+    symbols.
+    (cherry picked from commit 5cc67ae94c066dcac78072ad8a819c3b602d8bab)
+
+commit 10e0603fb989d1e6b2675ef5ca8223777b4921e6
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Tue Feb 24 23:12:57 2009 -0800
+
+    XQuartz: Re-enable support for capslock
+    (cherry picked from commit 4901b8147e593d26d7a31a9b73a201254b948916)
+
+commit e96921ca954ff0d3de8a69cea085aac2d43b0a2e
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Mon Feb 23 16:49:51 2009 +0100
+
+    DRI1: Make DRICreateDrawable return TRUE for pixmaps.
+    
+    GLX_EXT_texture_from_pixmap was broken since commit
+    a26c77ff432d2e85a2665fc36fca25143460c476 ('glx: fix retval checks when failures
+    occur for drawable creation.')
+    
+    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
+    (cherry picked from commit ef320bdd5ec3419abba77041d3a4d96a3ff87563)
+
+commit 584f46b81c6ed126014e963cb4ea40f83014f1c7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Feb 19 13:57:28 2009 -0800
+
+    Add Extensions section to xorg.conf man page
+    
+    Extensions section was added in X11R6.8.0 and documented in the release notes:
+       http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3
+    but never made it into the man page.
+    
+    Also fix a bonus typo.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    (cherry picked from commit ab61033700b5383a7a15370dd054eaa80e72e811)
+
+commit ae7991b16d7fefb4335b05f951a3228cef102683
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Feb 25 10:14:36 2009 -0800
+
+    Pre-clip panning coordinates to keep crtc within panning region
+    
+    There is a separate panning region check, but that doesn't work under
+    transformation, so just pre-clip the mouse coordinates when computing the
+    panning offsets. This leaves the case where panning constants are changing
+    unresolved.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry pick from commit c090f5514d28e1602a6ebbe7c909e98a0e3374d7)
+
+commit e59aa804df8a39541aa3224a5e688b819196070c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Feb 25 10:12:23 2009 -0800
+
+    RandR rotations and reflections offset by one pixel
+    
+    The matrix computation for rotation and reflection resulted in dropping a
+    row or column of pixels as the offsets used in the matrix computations used
+    width and height rather than width-1 and height-1.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 77c7a64e8885696665556c9fbcb3cffb552e367a)
+
+commit 9a59e7f304ab19c91738311bb9f1ec7709fc8847
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Feb 8 15:08:15 2009 +0100
+
+    xf86CrtcShadowClear is unused.
+    
+    Remove this now that clearing is done by repainting with appropriate extend
+    modes.
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 60a4f1368785d26a49a3ef6df829723ca154c154)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 369d7b22a9009e7054bd121484fa128c7a6d21f6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Feb 5 11:36:54 2009 -0800
+
+    Make panning+transform be correctly driven by mouse
+    
+    Figuring out how to adjust the crtc origin to keep the mouse pointer within
+    the crtc is a bit of a trick
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 63810aca31b962c93be4796883bde6ccb653e3a9)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c0a36197002c7de98f14dc98969409778d29dc50
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Feb 17 18:48:52 2009 -0800
+
+    Make RgbPath keyword in xorg.conf a non-fatal error
+    
+    Xorg shouldn't refuse to run just because the user has an xorg.conf that
+    had the previously-used RgbPath keyword in it.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit d2cf562bbad553d7f09b70202134f5b6ada0114e)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6b8bbbd21b39181e9dd3175fa73c05008c361ba2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Feb 4 11:50:18 2009 +1000
+
+    config: if we can't connect to HAL, listen for a startup notification.
+    
+    If HAL isn't available when we try to connect, the registered NameOwnerChanged
+    signal handler waits until HAL is available. Once we connected to HAL, we
+    unregister the signal handler again.
+    This allows HAL to be started in parallel or after the server has started.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 4844bff58f296b2851be4e6b955c3a68d02437a9)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4557b3f6c4273cd83b701beaf7a150c806fed298
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Feb 18 16:43:23 2009 -0800
+
+    X11/fonts/fontmod.h doesn't exist anymore.
+    
+    libXfont 1.4.0 no longer includes this file, nor do we need it, so just stop
+    attempting to reference it.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3575cb86a18d9e80e239acefdab18694e4ca2098
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Tue Feb 17 08:27:32 2009 -0800
+
+    glx: Inialize best_score before calculating visual scores
+    
+    This bug was pointed out by Peter Åstrand.
+    
+    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+    (cherry picked from commit 4039603413f9f46d7f725463a70b4a51838e0049)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d050a61747bd5e5f9c96f5df5a191598c3f01e5c
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Tue Feb 17 23:25:14 2009 -0800
+
+    configure.ac: Support version strings like W.X.Y.Z-XXXXXX
+    (cherry picked from commit 43967514cd57ad836d7fb85c8c9e58ada07e0232)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8e16e64f55deb8e94007915333ba356c0f7e4f73
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Tue Feb 17 23:24:25 2009 -0800
+
+    XQuartz: Don't need GlxSetVisualConfig any more
+    
+    Fixes build failure resulting from 516f8e2cad1311a09764e2633644188d1e3c31bb
+    (cherry picked from commit 066b17028a35956a089815716e38571f305469c5)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit eca523e7e7e267728a1f5ec346e012ada3debba0
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Feb 17 22:17:41 2009 -0800
+
+    Bump to 1.5.99.903
+
+commit a86dd529e9deaba61aee220d79ac607abbcb5dc6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Feb 6 06:34:35 2009 +0100
+
+    Eliminate the shadow clear on transform change
+    
+    When the crtc transformation changes, the entire crtc must be repainted.
+    This was being done by clearing the shadow and then painting the rectangle
+    containing the screen image; the clear being required as the screen image
+    may not fill the crtc. When changing the transform rapidly, this leads to
+    flashing. Eliminate the clear by painting the entire crtc instead of just
+    the screen rectangle.
+    
+    (cherry picked fom commit 5394b7e66224d20888dd4020f5cb8ca930720fb4)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5946d603e76206105bea41a8beeb116daf209964
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Feb 9 13:09:11 2009 +0100
+
+    Add XkbDir to Files config file section
+    
+    The XKB base directory was not configuable through the config file.
+    
+    (cherry picked from commit 76f18b94bd2719a8199334742d021c4d0806187d)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 39eb1bee84b520cfa45981c445c4c976d63ab03d
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Feb 17 12:59:16 2009 -0500
+
+    RANDR: Fail softly on GetPanning if the screen can't do it.
+    
+    Just return a zeroed-out reply in that case.  This is unambiguous, and
+    distinguishes "you didn't name a CRTC" from "you named a CRTC that can't
+    do panning".
+    (cherry picked from commit 123093996507c4d3b6dc457240ce00f8ac42f410)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 69a2728891e92da6a674d7313f3bb47c629b38dc
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Wed Jan 7 19:37:03 2009 -0200
+
+    Default to use standard bitmap fonts, with builtins as fallback
+    
+      The builtin-fonts configure option was removed, as it at best should
+    have been a runtime option. Instead, now it always register all "font
+    path element" backends, and adds built-ins fonts at the end of the
+    default font path.
+      This should be a more reasonable solution, to "correct" the most
+    common Xorg FAQ (could not open default font 'fixed'), and also don't
+    break by default applications that use only the standard/historical
+    X Font rendering.
+    (cherry picked from commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6)
+    
+        Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 444127f9f408d2f517fdfab0092bd67b29073373
+Author: Alan Hourihane <alanh@vmware.com>
+Date:   Fri Feb 13 13:45:08 2009 +0000
+
+    glx: fix retval checks when failures occur for drawable creation.
+    (cherry picked from commit a26c77ff432d2e85a2665fc36fca25143460c476)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4302a32391711ea86051c7e6d90cb018c79beec2
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Jan 30 14:19:41 2009 -0800
+
+    Make crtc_notify wrap/unwrap code do nothing unless mode code is inuse
+    
+    Drivers not using the new hw/xfree86/modes code would crash in DRI due to
+    that code trying to monitor CRTC changes.
+    
+    (cherry picked from commit ea309e47457156b60aadbf113f04e5b6851029c8)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 09cde70a6b3a05c28014862db19b36650412c2f3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Feb 2 12:30:57 2009 -0800
+
+    XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
+    (cherry picked from commit 8620579483789ae9ac1b68dbefe32b70011386de)
+    (cherry picked from commit 0dbc356795bbab3889b5f1684f55bd193757d0c9)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6bbe98f01d1fc66b6b853bdcdd62edf87a91627d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Feb 1 15:08:02 2009 -0800
+
+    XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
+    (cherry picked from commit e01662cadcaa4052e3a5aa82cbaed00a2d0220e0)
+    (cherry picked from commit fd08be749e0b3c5de02a6ae8b3d21f92c5986157)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 519ae3a0dfc61fc55370abec75551aa2615643fb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Jan 11 16:34:36 2009 -0800
+
+    XQuartz: Don't need explicit Activate/EnableDevice in InitInput
+    (cherry picked from commit b1d29784410b3b93037e5636f336ba608d8ad6e3)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ada58b69ca0a5e674cda7ae59a53061645621888
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 30 21:44:08 2009 -0800
+
+    x11-input.fdi: Add options needed to handle adding USB devices on Solaris
+    (cherry picked from commit 60bcdd687040db76490851d4b459284ce37020e0)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 516f8e2cad1311a09764e2633644188d1e3c31bb
+Author: Eric Anholt <eric@anholt.net>
+Date:   Sun Feb 8 13:00:15 2009 +0100
+
+    glx: Replace broken GLX visual setup with a fixed "all" mode.
+    
+    With trying to match depths so that you didn't end up with a depth 24
+    fbconfig for the 32-bit composite visual, I broke the alpha bits on the depth
+    24 X visual, which angered other applications.  But in fixing that, the
+    pickFBconfigs code for "minimal" also could end up breaking GLX visuals if
+    the same FBconfig was chosen for more than one X visual.
+    We have no reason to not expose as many visuals as possible, but the old
+    "all" mode didn't match any existing X visuals to GLX visuals, so normal
+    GL apps didn't work at all.
+    
+    Instead, replace it with a simple combination of the two modes: Create GLX
+    visuals by picking unique FBconfigs with as many features as possible for
+    each X visual in order.  Then, for all remaining FBconfigs that are
+    appropriate for display, add a corresponding X and GLX visual.
+    
+    This gets all applications (even ones that aren't smart enough to do FBconfigs)
+    get all the options to get the visual configuration they want.  The only
+    potential downside is that the composite ARGB visual is unique and gets a
+    nearly full-featured GLX visual (except that the root visual might have taken
+    the tastiest FBconfig), which means that a dumb compositing manager could
+    waste resources. Write compositing managers using FBconfigs instead, please.
+    (cherry picked from commit c40bad88475debf7a1774e22dce835577ad32154)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8b967b24690cb072fc37c463eceb2b886cef80c4
+Author: Eric Anholt <eric@anholt.net>
+Date:   Mon Feb 2 10:13:46 2009 -0800
+
+    glx: Don't match fbconfigs to visuals with mismatched channel masks.
+    
+    This fixes at least one known bug, where the depth 32 visual would end up
+    with a depth 24 fbconfig attached, angering compiz.
+    (cherry picked from commit 5100d829a4d71ce4a9fbc2b81694a1fb90066ccf)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7fdaca64463951ab9199dc12910379c90dba3fac
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Feb 17 18:57:13 2009 -0800
+
+    mi: force the paired kbd device before CopyKeyClass. (#19574)
+    
+    Some multi-media keyboards send the key events for multimedia keys through
+    the device file used by the mouse. Sending a key event through the VCP
+    however will fail. The VCP doesn't have a key class so the server crashes or
+    (with an appropriate fix) the event is simply swallowed.
+    
+    Thus, for key events if the master does not have a key class, get the device
+    paired with the master (i.e. the VCK) before processing the event any
+    further.
+    
+    X.Org Bug 19574 <http://bugs.freedesktop.org/show_bug.cgi?id=19574>
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a9dd41de7eecc1dcede4ccc8d5cf25f10343bb1a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Feb 2 10:20:13 2009 +1000
+
+    mi: don't call UpdateSpriteForScreen if we have Xinerama enabled. #18668
+    
+    In Xinerama all windows hang off the first root window. Crossing the screens
+    must not reset the spriteTrace, otherwise picking fails and events are sent to
+    the root window.
+    
+    X.Org Bug 18668 <http://bugs.freedesktop.org/show_bug.cgi?id=18668>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 9fe9b6e4ef669b192ee349e3290db5d2aeea273c)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 536748aa88f82e4157b86ed1a02b798b1510bdb8
+Merge: 8c6ddbf be21199
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Feb 17 18:52:04 2009 -0800
+
+    Merge branch 'panning-for-server-1.6' into server-1.6-branch
+
+commit 8c6ddbf754ff6c2eb99105f93aaa30749dced619
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Sun Nov 30 02:59:34 2008 -0200
+
+    Correct static symbol XkmReadTOC and first pass on compile warning fixes.
+    
+      The warnings corrected were only the ones that should correct
+    real problems. The most common one is 64 bit integers as
+    "printf %l" arguments.
+      Note that there is a patch related to this at:
+    http://bugs.freedesktop.org/show_bug.cgi?id=18204
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 16b11cd03d8c5def07f0e598f237f71a37883a46)
+
+commit 0c9db0ea10d9fd2a311bca47bba3c60e74ec6eec
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jan 9 14:32:14 2009 +1000
+
+    xfree86: always force RAW mode under linux.
+    
+    The previous check for AEI on left us with the possibility that AEI is forced
+    off in the config, but devices are added through evdev nonetheless. A keyboard
+    added this way can CTRL+C the server. Even when we use kbd, we can set the
+    mode to RAW, so it's safer alround to to so.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit b33905234025f005819c7e2acd653a3a0ecfeb82)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3284b03dca180ba2312904b1e20fe83df56f5f3c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Feb 12 18:34:22 2009 -0800
+
+    Check for and report errors writing xorg.conf.new from Xorg -configure
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    (cherry picked from commit ac470dfb4fadaa0b28b6f8b57f4f13a20842b897)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit caf503aef15865a969b881355d5e663490a6e194
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Feb 12 18:23:59 2009 -0800
+
+    Correct error message if specified config file is not found
+    
+    By making the "Unable to open config file" header a warning, it was
+    not appearing with the filename when a config file was specified and
+    not found.   Now we make it an error message again, but only issue
+    the error if a filename was specified - if none was specified, then
+    we don't even issue a warning, just the "Using autoconfig" info message.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    (cherry picked from commit bd713794ceaa1b2890522554562103c0a2d50f04)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 791c6ecceec94369f6035b8845a2cb293d194eef
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Feb 3 20:18:37 2009 -0800
+
+    Handle the combination of panning and crtc transforms
+    
+    This patch gets the shadow scanout buffer repainted on panning area changes.
+    It does not, however, track the mouse correctly.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 7968823cbc02615e1080c0d3f34dcebe14ea1771)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 099d74a12752808dd1972c28bdb228fc447d3774
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Feb 3 20:15:41 2009 -0800
+
+    Damage re-used shadow scanout buffer using new transforms.
+    
+    When the shadow scanout buffer can be re-used, the underlying framebuffer
+    area must be damaged so that the scanout will be repainted. This patch
+    delays the addition of that damaged area until after the transform in the
+    crtc has been updated, otherwise the old transform would have been used and
+    the wrong area repainted.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 763df9eec79a867978efc5138d8635a46c1a0d17)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4992c31e6c09a9140d4482d762b5dfff0a4efedb
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Feb 3 20:12:42 2009 -0800
+
+    Handle matrix computation overflow in RRTransformCompute
+    
+    If the computation of the composite fixed-point transform for RandR
+    overflows at any point, take the resulting floating point transform and
+    scale that back to fit in a fixed point matrix. This ensures that a matrix
+    will always be available, although perhaps at reduced precision. Someday we
+    should add floating point matrices to Render.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 62fc98cb88e4e8b636f343453fc1168a87c58972)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 660c2a7d4c6cb52fd0992e9d2008a24805dc8c02
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Thu Feb 12 18:27:48 2009 -0800
+
+    Query the DDX in ProcRRGetScreenInfo.
+    
+    This is the RandR 1.1 version of GetScreenResources and needs to re-query the
+    DDX to see if the mode pool changed.
+    
+    Fixes Launchpad bug #325115.
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 34724f45512e311377b972da480d35304fd687cc
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Fri Jan 30 03:56:39 2009 -0200
+
+    Work around inclusion of <X11/extensions/panoramiXext.h>
+    
+      The X Server build only needs the macros PANORAMIX_MAJOR_VERSION
+    and PANORAMIX_MINOR_VERSION from that header.
+      Addition of extra prototypes to <X11/extensions/panoramiXext.h>
+    caused a X Server build failure.
+
+commit 1f729b42d567ae9533ac0e467afc9fbc83390776
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Jan 30 21:12:17 2009 -0800
+
+    Version to 1.5.99.902
+
+commit 56f6fb8c8652c85e522e42557f8969987069076b
+Author: Eric Anholt <eric@anholt.net>
+Date:   Fri Jan 30 19:06:17 2009 -0800
+
+    randr: Avoid re-querying the configuration on everything but GetScreenResources.
+    
+    The new path should only re-query on the other requests when we haven't
+    gathered the information from the DDX yet (such as with a non-RandR 1.2 DDX).
+    
+    Bug #19037.
+    (cherry picked from commit 317f2b4a9fe4b606975711bc332166a82db5087d)
+
+commit 6d928aa227b12832dd358619722a5f4dc71b5d19
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Jan 30 20:17:10 2009 -0800
+
+    RandR crtcs not fetched correctly when primary output is set.
+    
+    Primary outputs may not have a CRTC.
+    Loops fetching CRTCs respecting primary output were broken.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 4de5705545792d77c9990bbec3e263a517757a2a)
+
+commit 759ed0679a030f502b74a6ff44c15d1c97d9a937
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Jan 30 19:14:36 2009 -0800
+
+    RandR SetOutputPrimary should work with or without a crtc connected
+    
+    The test was inverted from the protocol spec, and besides, the test is bogus
+    anyways.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit c1f2be1f3fd0c80cb4c85b98140b98aa9311242b)
+
+commit b893dc59da9f5a7afb59ea0b2cd794872fc5727f
+Author: Thomas Jaeger <ThJaeger@gmail.com>
+Date:   Sat Dec 20 16:17:02 2008 +0100
+
+    Don't release grabs unless all buttons are up
+    
+    Previously, only buttons <= 5 would count here, but the core protocol
+    allows for 255 buttons.
+    
+    http://lists.freedesktop.org/archives/xorg/2009-January/042092.html
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 717a961528ec69a6e630d536e15568670e0b398a)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 191161a24a80dc553b11f829c12cfffb76ec7185
+Author: Thomas Jaeger <ThJaeger@gmail.com>
+Date:   Mon Dec 22 00:55:09 2008 +0100
+
+    Count the number of logically down buttons in buttonsDown
+    
+    This fixes the following bug.  Assuming your window manager grabs
+    Alt+Button1 to move windows, map Button3 to 0 via XSetPointerMapping,
+    then press the physical button 3 (this shouldn't have any effect), press
+    Alt and then button 1.  The press event is delivered to the application
+    instead of firing the grab.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit f7f85f696570541e2dd43462675de9e6ee46f545)
+
+commit fe0abdceb483ec0bb2977016b00aef57033aa449
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 8 11:53:30 2009 +1000
+
+    mi: ensure chained button mappings from SD -> MD (#19282)
+    
+    After copying the master event, flip the detail field to the mapped button of
+    the SD, not the physical button. This way if the SD has a mapping 1:3 and the
+    MD has a mapping of 3:4, a press on button 1 on the SD results in a core event
+    on button 4.
+    
+    X.Org Bug 19282 <http://bugs.freedesktop.org/show_bug.cgi?id=19282>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3441917008021fb13cf86fa619970859d927e17a
+Author: Thomas Jaeger <thjaeger@gmail.com>
+Date:   Mon Jan 5 01:26:42 2009 -0500
+
+    Don't alter device button maps in DoSetPointerMapping
+    
+    Currently, if a device map differs from the core pointer map, then the
+    request may return MappingBusy, even though all the affected core
+    buttons are in the up state.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 3d549438c29004d78032ecc50ab45ca0e3f49623)
+
+commit 364bcbea48d5e49bef8d36f6724e2702cbb4b1af
+Author: Thomas Jaeger <ThJaeger@gmail.com>
+Date:   Fri Jan 9 02:02:38 2009 -0500
+
+    Xext: Send out correct events in ProcXTestFakeInput
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit b2756a71a432f7cf7c870a48676c98625512558d)
+
+commit e789789196db8271a83c751fdf990ceb70164cb1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 5 15:48:45 2009 +1000
+
+    xkb: fix typo - missing negation when checking button state.
+    
+    Introduced with a85f0d6b98237d8a196de624207acf1983a1859a.
+    
+    Reported by Thomas Jaeger.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 515ce3e4ba42605a1ee9979e8bb5acd3cf6470a3)
+
+commit ebb3872925315d705e47e1ccd7f193ac90ac33dc
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 26 11:15:05 2008 +1000
+
+    Xi: fix use of button->down - bitflags instead of int arrays.
+    
+    The device's button down state array was changed to use DOWN_LENGTH and thus
+    bitflags for each button in cfcb3da7.
+    
+    Update the DBSN events to copy this bit-wise state.
+    Update xkb and Xi to check for the bit flag instead of the array value.
+    
+    Reported by ajax.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit a85f0d6b98237d8a196de624207acf1983a1859a)
+
+commit 50d80c25525a691472e3fc5859fb303a3ffe1ef2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 12 15:29:36 2009 +1000
+
+    dix: fix WarpPointer calls for devices with custom valuator ranges (#19297)
+    
+    If the MD's lastSlave was a devices with custom axes ranges, then a
+    WarpPointer would position the cursor at the wrong location. A WarpPointer
+    request provides screen coordinates and these coordinates were scaled to the
+    device range before warping.
+    
+    This patch consists of two parts:
+    1) in the WarpPointer handling, get the lastSlave and post the event through
+       this device.
+    2) assume that WarpPointer coordinates are always in screen coordinates and
+       scale them to device coordinates in GPE before continuing. Note that this
+       breaks device-coordinate based XWarpDevicePointer calls (for which the spec
+       isn't nailed down yet anyway) until a better solution is found.
+    
+    X.Org Bug 19297 <http://bugs.freedesktop.org/show_bug.cgi?id=19297>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit d36adf52a2b2711d22b11105f7bd907d4493fb9b)
+
+commit b19f12712a0762f20065282fd055fe9bc3ca975f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 12 16:16:24 2009 +1000
+
+    dix: EnqueueEvent and PlayReleasedEvent need to handle DeviceMotionNotifies
+    
+    No MotionNotify events in the processing anymore, so let's have them treat DMN
+    instead.
+    
+    Reported by Thomas Jaeger.
+    (cherry picked from commit 488d45295105daf10ccd17ca93ae6a6f4d0104f1)
+
+commit ef796a95dd7ddf4ad5761a6ee2de1cdb56190ba2
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date:   Tue Jan 6 10:03:19 2009 +0800
+
+    avoid a potential endless loop.
+    
+    Previously it is possible that creating rotation data, then cleaning
+    up and creating again so that pScreen->BlockHandler and
+    xf86_config->BlockHandler all point to xf86RotateBlockHandler.
+    See bug #19343.
+    (cherry picked from commit 5f3188228eb988bd8f08b62c84f98a8ff66ee283)
+
+commit 840b4da5f29e43ccadc720f075e00237d12ef01b
+Author: George Staplin <gstaplin@apple.com>
+Date:   Mon Jan 26 03:02:38 2009 -0700
+
+    XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
+    (cherry picked from commit 143224405ba74929c702a95de52b56df140b0d1b)
+
+commit 97a6f55f221e3d470add18db80e3769713480103
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Jan 16 19:26:07 2009 -0800
+
+    XQuartz: SnowLeopard: Help system book name changed in 10.6
+    (cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
+
+commit e81b4d495ba02d4fc0b05c26a53fd2a816a61eaa
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Jan 16 13:54:08 2009 -0800
+
+    XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue
+    
+    Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
+    (cherry picked from commit 94e417ac87a98cd5c6bf2d7c495d702748398931)
+
+commit d6498ea62117cce6a00ac045ddeefb7268a70f5b
+Author: Eric Anholt <eric@anholt.net>
+Date:   Fri Jan 30 16:17:58 2009 -0800
+
+    Move the apple fat binary hacks back to a header file, and make it apple-only.
+    (cherry picked from commit dd098501d800571e71d06ffc936635a6c9d44e05)
+
+commit b530a0e97b5737375ca1f4eced26d587a16f843f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Jan 15 20:57:42 2009 -0800
+
+    XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
+    (cherry picked from commit f020900641b44a1142e5c2198e9678de2744454e)
+
+commit 82fd4d170824068dddf3b4e6581a12d48e1a069a
+Author: George Staplin <gstaplin@apple.com>
+Date:   Mon Jan 12 19:30:43 2009 -0700
+
+    XQuartz: xpr: Cleanup some of the code and possibly fix part of the GLX Pixmap problem.
+    
+    Split DRICreateSurface into 3 functions.
+    
+    Make CreateSurfaceForPixmap use xp_configure_surface.  I suspect this is partly why
+    GLXPixmaps never worked.
+    
+    It will require some more work and thoughts for pbuffers, unless we fake those with
+    pixmaps and surfaces.
+    (cherry picked from commit 9cf264e67744262b9f45079e6cd752eb3e3b0e08)
+
+commit 9cbdcf1fa4bdcc115def9f134a57ac96a56c69dd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Jan 11 14:49:39 2009 -0800
+
+    XQuartz: Only call DarwinUpdateModKeys when needed
+    
+    Previously, we were calling it on almost every itteration through sendX11Event
+    (cherry picked from commit 6461729647ff4441d80811e73f0c0d2f108f2700)
+
+commit 037e52fd7353410397dfd877b3e9af99f791fce1
+Author: George Staplin <gstaplin@apple.com>
+Date:   Mon Jan 12 14:14:44 2009 -0700
+
+    XQuartz: GL: Make indirect.c build and work in the 1.6 branch.
+    
+    Reorder some header files and provide some types earlier on.
+    
+    Remove the static __GLXextensionInfo __glDDXExtensionInfo; that isn't
+    used in 1.4 or 1.5, and seems to have been removed from 1.6.  Remove
+    the data structures associated with that too.
+    
+    Remove __glXAquaDrawableResize.  The GLX structure doesn't use
+    it anymore, and the Apple version did nothing useful before.
+    
+    __glXAquaDrawableSwapBuffers(): base no longer contains a drawGlxc
+    member.  Now provide the the Apple/Aqua context in the __GLXAquaDrawable
+    struct.  Add the context member to the __GLXAquaDrawable struct.
+    
+    Remove the fallback configs.  They aren't used in 1.4 or 1.5 either.
+    
+    Remove init_visuals().  It's not used in 1.4 or 1.5 either.
+    
+    In the drawable constructor initialize the state properly, including
+    the new context member.
+    
+    Remove glAquaResetExtension() -- it's not used anymore.
+    
+    This has been tested remotely and proven to work with glxgears,
+    fire, various texture programs I wrote, and various Mesa demos.
+    (cherry picked from commit d514152195452ae11ec7769c76489651620ad380)
+
+commit ee9736b26b1021fac2cf259e6b2142ea780b2af8
+Author: George Staplin <gstaplin@apple.com>
+Date:   Fri Jan 9 16:08:26 2009 -0700
+
+    XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT.
+    (cherry picked from commit 3c14546f58f8a138fe67c9cacc3bd0b7fa90c29a)
+    (cherry picked from commit a665ed16f736cf1901b89448dc5d37f4d16dfaf4)
+
+commit b646513861aac9538ba3ebd8e2c7ef530392ff5d
+Author: George Staplin <gstaplin@apple.com>
+Date:   Fri Jan 9 15:53:39 2009 -0700
+
+    XQuartz: GL: Make many more fbconfigs and visuals available for the 1.5 branch.
+    
+    Use a __GLXconfig linked list struct to store the configurations for the
+    fbconfigs and visuals in a pGlxScreen.
+    
+    Also, remove the __GLXvisualConfig/GlxSetVisualConfigs code that isn't used
+    anymore.  There is more code we can remove later, but I want to do that in
+    separate commits.
+    (cherry picked from commit 94162b0f8a25267aca280d25e216cc6bde47da6e)
+    (cherry picked from commit 15bb6abd59fdefe7037237faaea1a39711a972ed)
+
+commit 9e03178ae2da6beb939141f662d875c4c1d40354
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Tue Jan 13 13:05:32 2009 +0100
+
+    EXA: Declare glyph cache picture as component-alpha when necessary.
+    
+    Without this, rendering component-alpha glyphs may break without a mask.
+    
+    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=19233 .
+    (cherry picked from commit 639f289dcdbe00a516820f573c01a8339e120ed4)
+
+commit 648807adb059b6cfc413d41e3a37670ce850aee6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Jan 30 15:43:04 2009 -0800
+
+    Make RandR CRTC info report panning area instead of just crtc area
+    
+    This makes the RandR info consistent with the Xinerama info.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 6e49fdd2c839b6244c23ce95c3ae76a1a265b986)
+
+commit 9b2958b3a2fb4b65d67916ba7e98dfd21ad434f3
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Dec 19 18:59:27 2008 +0100
+
+    randr: Consider panned crtc's when calculating xinerama screen sizes.
+    
+    - This will allow window managers and applications to actually use the panned area.
+    (cherry picked from commit 332d65ec7a6e94d75efe95d53742f137835274de)
+
+commit 251d0d8090322b2c9dc0c8b7bef001f338d19433
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Jan 12 13:03:30 2009 -0800
+
+    Update version to 1.5.99.901 (1.6 RC1)
+
+commit 71628cabc9dddf5c9fe12d555ae0c47d5902b2f7
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Jan 12 11:51:28 2009 -0800
+
+    Merge include/dix-config-post-verbatim.h into include/dix-config.h.in
+    
+    No sense having an extra include file here; it makes building stuff harder.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit cbd977cc15cf22a3e42b10942d5657cb8b9ac335
+Author: Alban Browaeys <prahal@yahoo.com>
+Date:   Mon Jan 12 10:57:11 2009 -0800
+
+    Fix dmx compile on 1.6 branch.
+    
+    http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg166742.html
+    contains a patch from "arekm" which I build upon to make up this one.
+    
+    Mostly fixes for Xcalloc which I previously tried to fix the same way but
+    without finding the right spot.
+    
+    I cannot tell if dmx works though. Only that it at least compile.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6be355b8e8cabeb5832ce9970a83782ea46fd4d1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jan 9 13:46:20 2009 +1000
+
+    dix: drop x/y back into last.valuators before updating the history (#19285)
+    
+    positionSprite needs to scale to screen coordinates and in the process of
+    doing so alters dev->last.valuators[0:1]. Drop the real coordinates back after
+    finishing and before updating the motion history. This way, we don't push the
+    screen coordinates into the motion history.
+    
+    X.Org Bug 19285 <http://bugs.freedesktop.org/show_bug.cgi?id=19285>
+    (cherry picked from commit 56efbc0986e782da45addb05ece9f456d41d7a90)
+
+commit ca21fd7ddf50e6a363c6ad027d46388596872d3b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Jan 11 01:52:42 2009 -0800
+
+    XQuartz: Add locking to make mieq thread safe on OSX
+    (cherry picked from commit 7a8d2266861e74176b5310b83652a9c10a170494)
+
+commit 671b71a6cba1c9da7797524f21ef1b27ff04adfd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Jan 11 01:42:24 2009 -0800
+
+    XQuartz: misc 1.6 updates (still --disable-glx)
+      rlAccel is not longer compatable, and it's not worth fixing
+      Don't override DeviceCursorInitialize with a noop
+      Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
+    (cherry picked from commit c137f681680e1d04b1513a8be68aeda4d1c56fd5)
+
+commit 69ddac23281534a06c0acb3005a09e4448594925
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Jan 10 01:39:08 2009 -0800
+
+    Apple: Don't use DRI2
+    (cherry picked from commit a1d35cee5907a76977ee43c49cb55c8f411c9794)
+
+commit 681cc0f38b0b96c5e41c93d6944e4fa58c950eda
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Dec 23 12:39:38 2008 -0800
+
+    XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth
+    (cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3)
+    (cherry picked from commit 932ed6e949757926a17f7efe6b0255e38efa1152)
+
+commit 7872669105d6d81ded5128eb4d4f1acce34c3b02
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Dec 9 23:48:18 2008 -0800
+
+    XQuartz: Make debugging output for invalid depths a bit more detailed
+    (cherry picked from commit 609fb166b7062c76f0561df12ffe893811f6ac8f)
+    (cherry picked from commit 1962af7ee3bdf54cfa674187dea67b9ad36cd5a1)
+
+commit fdfc70ea0a183daaabb9bb436f2b0cbf95f47e88
+Merge: 8cfb353 82f4273
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Jan 12 10:40:04 2009 -0800
+
+    Merge commit 'whot/server-1.6-branch' into server-1.6-branch
+
+commit 82f42730fa268e85dc95c43a6450c35f9e57acdf
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Dec 15 10:46:07 2008 +1000
+
+    mi: force CopyKeyClass for key events. (#19048)
+    
+    While we don't want to copy all other device classes into the VCK, we need to
+    copy the key class to transfer the layout from the SDs into the VCK.
+    This resembles the functionality of SwitchCoreKeyboard in server 1.5.
+    
+    Thanks to Colin Guthrie for providing the follow-up patch (#19222)
+    
+    X.Org Bug 19048 <http://bugs.freedesktop.org/show_bug.cgi?id=19048>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8cfb353078d9b5d03a9633304038141a60adc970
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 12 11:07:08 2009 +1000
+
+    dix: Fix handling of do_not_propagate_mask window attribute.
+    
+    This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2.
+    
+    Signed-off-by: Kim Woelders <kim@woelders.dk>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 30d2cfcd3851870178d62e5067211aa36f87fbd2)
+    
+    Conflicts:
+    
+    	dix/events.c
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 10c0287232eab1b93d078774f52e65efa0c03607
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 12 11:07:08 2009 +1000
+
+    dix: Fix handling of do_not_propagate_mask window attribute.
+    
+    This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2.
+    
+    Signed-off-by: Kim Woelders <kim@woelders.dk>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 30d2cfcd3851870178d62e5067211aa36f87fbd2)
+    
+    Conflicts:
+    
+    	dix/events.c
+
+commit 93e510d3abaee97f5b7812abc3a2693dabf94478
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Dec 4 10:30:02 2008 +1000
+
+    xfree86: Only use the evdev ruleset on linux.
+    
+    As suggested by Julien Cristau
+    
+    This is an follow-up to
+    commit 9c5dd7337fa93fb1650cc017e523b939dcbf482a
+    Author: Peter Hutterer <peter.hutterer@redhat.com>
+    Date:   Wed Dec 3 14:24:25 2008 +1000
+    
+        Let the DDX decide on the XkbRulesDefaults.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Acked-by: Julien Cristau <jcristau@debian.org>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    (cherry picked from commit 13de7511b17b57a28668e1a60b196ccfe61dbcbe)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit cc78f04b22daabc06d9fb82f550e3f4dbbe76f28
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Dec 3 14:24:25 2008 +1000
+
+    Let the DDX decide on the XkbRulesDefaults.
+    
+    Rather than assuming rules in the CoreKeyboardProc, init the default rules in
+    InitCoreDevices, then re-use them later.
+    
+    In the xfree86 DDX, set the rules to "base" or "evdev", depending on whether
+    we'll load kbd or evdev.
+    
+    If we create a new MD, use pc105,us as default and re-use the rules file used
+    previously.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 02c059ea99a791b9e3643b4fb131af01306b1c23
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Jan 11 15:56:28 2009 -0800
+
+    dix: move focus handling into enterleave.c.
+    
+    This commit moves the focus handling from events.c into enterleave.c and
+    implements a model similar to the core enter/leave model.
+    For a full description of the model, see:
+    http://lists.freedesktop.org/archives/xorg/2008-December/041740.html
+    
+    This commit also gets rid of the focusinout array in the WindowRec, ditching
+    it in favour of a local array that keeps the current focus window for each
+    device.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit eb2d7b3d700952ba88c77deacf687b251300e660)
+    
+    Conflicts:
+    
+    	dix/events.c
+    	include/input.h
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c75445754e283dc2a306ef1cf2bbd94b40423640
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Dec 19 21:05:09 2008 +1000
+
+    dix: add a few auxiliary functions for the updated focus model.
+    
+    SetFocusIn and SetFocusOut, including the static array to keep all focus
+    windows.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 673eb23aac578dcdc04e2a99d1fa5c2987eb58b8)
+
+commit ceeb62f892a1a4df9ef1054d2c9ba12e26d55ef2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Dec 18 15:55:11 2008 +1000
+
+    dix: reduce FirstPointerChild complexity
+    
+    Instead of keeping a flag on each window for the devices that are in this
+    window, keep a local array that holds the current pointer window for each
+    device. Benefit: searching for the first descendant of a pointer is a simple
+    run through the array.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 38b28dcadd0990cb43f50db4300eebb8f044db96)
+
+commit ed90245461f33f1e0eac01c0dea4d0132364f60a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Dec 18 15:43:18 2008 +1000
+
+    dix: remove now unused "exclude" parameter from FirstPointerChild
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 72ad4a85cc0ffe60a90011d65ef718d5852beae4)
+
+commit f0025f59e85f48da5e77cd6b759a693d40b2f9ea
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Jan 9 11:20:31 2009 -0800
+
+    dix: re-implement enter/leave model.
+    
+    The old model was implemented based on a misunderstanding of NotifyVirtual and
+    NotifyNonlinearVirtual events. It became complicated and was broken in some
+    places [1]. This patch wipes this model completely.
+    
+    A much simplified implementation is provided instead. Rather than a top-down
+    approach ("we have a tree of windows, which ones need to get which event")
+    this one uses a step-by-step approach. For each window W between A and B
+    determine the pointer window P as perceived by this window and determine the
+    event type based on this information. This is in-line with the model described
+    by Owen Taylor [2].
+    
+    [1] http://lists.freedesktop.org/archives/xorg/2008-December/041559.html
+    [2] http://lists.freedesktop.org/archives/xorg/2008-August/037606.html
+    (cherry picked from commit 0aa4460c3b4f9bb17d5412d76fa8c4c501132429)
+    
+    Conflicts:
+    
+    	dix/enterleave.c
+
+commit 1ffd9ec7606606570980490b91b780e02bc29d7d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 16 17:10:03 2008 +1000
+
+    xfree86: don't restore the TTY mode if we didn't initialize it ourselves
+    
+    Restoring it unconditionally means we restore to whatever tty_mode has as
+    default value (i.e. 0). K_RAW happens to be 0x00, so we always restore to raw
+    mode if allowEmptyInput is off.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+    (cherry picked from commit aea6f19f25e13768b1d09fac4991d6a5e6c2cdac)
+
+commit 3c11efd7dc09aa92039f851c2bbf2ca6b5a5ac8c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 23 09:59:28 2008 +1000
+
+    xfree86: If an input device failed to activate, return immediately.
+    
+    Devices are only activated once - right after they've been added to the
+    server. If a device failes activation, it's dead. There's no reason to
+    continue. Return the error code from ActivateDevice() without setting up
+    sprite information or even sending a event to the client.
+    
+    Then - in the DDX - just remove the device again.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 27011254c4de4e573a0851bf46892fb488db6522)
+
+commit 2ce48363b862db134624797bc071f8c45323a075
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 23 10:00:34 2008 +1000
+
+    xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
+    
+    X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176>
+    (cherry picked from commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a)
+
+commit 3225e1378e3929e538941bbfc9ec495638bd407a
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Dec 26 15:51:55 2008 +0100
+
+    exa: preparing as source and finishing access as mask is a bad idea
+    (cherry picked from commit 027b440d4f9f0cdd46addff46fd2d5c44cd5c847)
+
+commit 2056c10d12f6b4facf628b861230f9b0a13f3a73
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Dec 26 16:38:27 2008 +0100
+
+    exa: Allow drivers to set non-NULL devPrivate.ptr for !offscreen pixmaps.
+    (cherry picked from commit 3534a5e5d9c5af85149c799f324257f89507fa23)
+
+commit 4130761f151ff5414694472e1dc29d8f2893f10e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jan 7 10:56:26 2009 -0800
+
+    XQuartz: Fat binary buildfixes
+    
+    Let Xarch.h set X_BYTE_ORDER for us.
+    Determine _XSERVER64 at build time.
+    (cherry picked from commit f54736c2b0b537c8322ecb2db8e9cee5eea68165)
+    (cherry picked from commit cc677cb4f458f371a4012ce0dc1121a52a2cb699)
+
+commit 2eb09af56179d570a6d52b65c2029a2b62dcdff3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Nov 16 15:35:17 2008 -0800
+
+    XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
+    (cherry picked from commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d)
+    (cherry picked from commit 65ab2f44ea7fc4d87e021bed548eda81fc3cbae7)
+
+commit fecc82ee1147cb314725ac774525a18a861ed719
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Jan 2 11:06:12 2009 -0800
+
+    XQuartz: Copyright Update... happy new year
+    (cherry picked from commit 9f1c26ae8d9ccf81cba0ab946326968a701f8c36)
+    (cherry picked from commit df6ca888b0c04fdf4ff2d7fb4a414275b983ed34)
+
+commit d80e35a9ae507ad742f97ca7254314ff28371688
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Jan 2 10:58:40 2009 -0800
+
+    XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
+    (cherry picked from commit 49e59d32b88e4fad070f230b5efaa261b47f78db)
+    (cherry picked from commit adbfd49da2453b58a9e13b09c62e0611ea1c3f77)
+
+commit c32a680f2670f05902ee323c68f772f52d3a8320
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 31 12:40:02 2008 -0800
+
+    XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASK
+    
+    We don't have keycodes for them, so don't try to use them
+    (cherry picked from commit cb912aca3a2834c4ad8e386c8a0d05c1bb31b0e7)
+    (cherry picked from commit 0676a580fcc05d54049269028a34358935a4101c)
+
+commit e08ce79152b0887b8d67c4b03b33634f5ef499bc
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 31 11:57:49 2008 -0800
+
+    XQuartz: Make sure to reset the saved key state when deactivating X11.app
+    (cherry picked from commit 3eef78eb321f4f7dbca5a10c80666c621e28a1e0)
+    (cherry picked from commit 0d2621b6d4684ec62e67156a5a9dbdd3297f9cb0)
+
+commit bdf776b4579921dd49316c2ff32ff12cc702720a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 31 12:44:50 2008 -0800
+
+    XQuartz: Honor system key repeat rate
+    (cherry picked from commit 4303c9be39a86f5a21de108f72b90a989435905e)
+    (cherry picked from commit 9faf3de7e5610af340b92acb1b86bf03b6f2241a)
+
+commit 16560db0c041b24346e186169f6e3bd315ca13ae
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Dec 29 19:54:12 2008 -0800
+
+    XQuartz: Better avoid stuck keys on context switches
+    (cherry picked from commit e9963f1a4f4f12f253eae9d4f01694b6cabe35ad)
+    (cherry picked from commit 4be8d7346b9fdc014b72dd6c404ceecc0ef0d245)
+
+commit 66f801f5a06925c303027f856c5ecea4926d80f2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Dec 29 19:38:31 2008 -0800
+
+    XQuartz: Workaround OSX VNC server bug for modifier key state
+    
+    A better approach which ensures we have a L modifier key down if we are told neither are down and atleast one is down... =/
+    (cherry picked from commit bc13dda345f716bf4de9bfe4e1d85969263b60c2)
+    (cherry picked from commit c67a3e2972c75c02f1aeed94bc0a3c5272422267)
+
+commit a05dbce40248159099c7a7ec7e94bff9ffb700fc
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Dec 29 00:30:31 2008 -0800
+
+    XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
+    (cherry picked from commit 00f3a2e33c8e91da5f855821313a04ea97445656)
+    (cherry picked from commit d790c9dd041a2c8e3513d14a556333219d0f8d5e)
+
+commit b8877bb9e4c113a400e47a65a7d25d21f0a43116
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 28 15:57:59 2008 -0800
+
+    XQuartz: pbproxy: We explicitly need libX11 for pbproxy
+    (cherry picked from commit 32824120da0749b8369c2592f851bb1030dea9f1)
+    (cherry picked from commit 8c6e8fa811c782c85e7fefbe75fe5480098739ae)
+
+commit de78ac43782d7f4ad4b98622e3c419c893d3eeff
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 28 01:53:38 2008 -0800
+
+    XQuartz: Try harder to get the user's login environment
+    (cherry picked from commit 6bedaddd78aa04bd303df434a4c49bb87bd7deaa)
+    (cherry picked from commit 338f096861136fb6c4f604e93ff21277252676b7)
+
+commit c391114df95109d306e172bea75781d0e9523f62
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 24 00:39:06 2008 -0800
+
+    XQuartz: Reposition windows when we enter fullscreen to ensure our root window
+    (cherry picked from commit 7617d3659b5481ef85aecc1f936e7dd2662bdfbd)
+    (cherry picked from commit 61ae56f97326c57dda05632ca9f4873238ee18e1)
+
+commit beafebef82687d777d88152c62a351954df7c864
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Dec 23 20:33:27 2008 -0800
+
+    XQuartz: Re-enable rlAccel
+    
+    It was incorrectly blamed for some crashes a few months ago, and it should be
+    safe to use until we get an EXA driver to replace it.
+    (cherry picked from commit 8121f30bd29591fc74fbc680fbbf20210271fa58)
+    (cherry picked from commit 85347902d97f2d4937f63ae1fac62ee46a61c82f)
+
+commit 86ba5eff623336592091b990209eb07b3f74f8b9
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 21 21:03:59 2008 -0800
+
+    XQuartz: Don't use keycode 0 to determine !swallow since our most common key to swallow is actual keycode 0 (a)
+    (cherry picked from commit 33f43a7f03023bfbab25a957cb81fc25b4afa4ca)
+    (cherry picked from commit 84f0c03418bf74188596635dcac128fc05f204ad)
+
+commit 2a42a059ce7b259622b36fb3ef909f289d5388d7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 21 20:40:36 2008 -0800
+
+    XQuartz: Update our "screens" when we toggle rootless rather than when we toggle fullscreen
+    
+    This old behavior was used as a workaround for the menubar behavior in the older server,
+    but we handle it better now and need to update our screens when we toggle the rootless
+    state instead.
+    (cherry picked from commit 508aa95bc2cd3fdc3dff448ec090919bf807d153)
+    (cherry picked from commit 7e7758e1780326ad867be74dbd583a154bad017b)
+
+commit 51319550c9bb079c3af1b98c96c5174bc74e0dbd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 21 14:54:11 2008 -0800
+
+    XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
+    (cherry picked from commit 67455e716e3ecffd528930479192785958d37988)
+    (cherry picked from commit 7dc0dafef1d241d396f215c506ec2d4f7d8e3a24)
+
+commit b0503b69f998bcf5398ed0382a38346a3f18a77c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 21 14:43:12 2008 -0800
+
+    XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
+    (cherry picked from commit 22f664ab95a0cae981e9cefad6f075d051583ca5)
+    (cherry picked from commit 4c256c0e9c4fe61990343c8bcf2e352c83d76e69)
+
+commit 6c635faa6ff0474199f4f7375022efe1e8ffa8f1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Dec 21 14:42:26 2008 -0800
+
+    XQuartz: update quoting in case X11.app is moved to a directory with a space.
+    (cherry picked from commit cc805dc799efa37c8dcefa3db04d87e9b835ffbd)
+    (cherry picked from commit ecc3a7b6090552c309fe8e264d527ddd666a5761)
+
+commit 14d9ccf0ce4c5b4820e692cb58077c4c5918f12a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Dec 18 09:14:16 2008 -0800
+
+    XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
+    (cherry picked from commit b62ed1f8eaf041a946bb591165bb18ee481dedbf)
+    (cherry picked from commit c3812aec973b7341a600e5d2d07d5a7f15abd609)
+
+commit 87df8e681988e546ed943b0f3e7df2851ada4712
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 17 15:09:35 2008 -0800
+
+    XQuartz: Get rid of white rectangle bug
+    (cherry picked from commit 3269959033ed0c675a3a906666454df34086896a)
+    (cherry picked from commit fd6fb6a2771df152b57f9dfb159fa42a3b1d37cd)
+
+commit 5ff6b1e7ed11a37b2878f2f9a37b2afce00baeb0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 17 13:54:53 2008 -0800
+
+    XQuartz: Name the startup shell script X11 for better compatability
+    (cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
+    (cherry picked from commit 102abeda37d6b62971a9952efa0453e38504ae0b)
+
+commit ffdf0139051c51f94d6a7a9a5fc2ccc68959d14b
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Dec 19 19:10:23 2008 +0100
+
+    randr/xfree86: Fix a one off error in the panning calculations.
+    
+    - Example: mode 1280x1024, panned area 1281x1024
+               panned_area.x2 = 1281
+               mode.width = 1280
+      If you substract 1280 from 1281, then that leaves you with one.
+      Which is the one pixel that you need to move to actually see the last pixel collumn.
+      Substracting 1 from this will consistently prevent you from seeing the right and bottom edge.
+    (cherry picked from commit aedd2f566df585db7a1614f302cc8d3feda54275)
+
+commit 2a822c231145afd2b99498d5d4bf96be7dff92c5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Dec 15 03:18:13 2008 -0800
+
+    mi: Reuse memory in mieqProcessInputEvents rather than making excessive calls to calloc()
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    (cherry picked from commit a939368ab8140d48c1da4ba0bb229d13b221189c)
+
+commit a067bd907e9d3e55edd6ca61279968b6cb96236c
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Dec 1 21:20:48 2008 +1000
+
+    mi: Clean up CopyGetMasterEvent, re-use the memory.
+    
+    Alloc an EventList once and then re-use instead of allocing a new event each
+    time we need a master event.
+    There's a trick included: because all the event processing handlers only take
+    an xEvent, init a size 1 EventList and squash the events into this one.
+    
+    Events that have count > 1 must be squished into an xEvent array anyway before
+    passing into the event handlers, so we don't lose anything here.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Acked-by: Daniel Stone <daniel@fooishbar.org>
+    (cherry picked from commit d281866b74f7067f2704c278fe9720eafc0ee5ef)
+
+commit 3519f83f509dd0363f574d3a68b21df98d5f2732
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Dec 10 11:35:09 2008 +1000
+
+    dix: move MAX_VALUATOR_EVENTS into include/input.h
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 0b4fef6337d88ae8ef05b8b73941350a9007565c)
+
+commit 3ec3b502e3c6f0b74f8d96f7dda4f872156589a1
+Author: Francis Giraldeau <francis.giraldeau@revolutionlinux.com>
+Date:   Wed Dec 17 09:49:39 2008 +0200
+
+    Don't log audit messages when -audit 0 specified
+    
+    make the auditTrailLevel check more general and don't log when not
+    using DTRACE and -audit 0 is set.
+    (cherry picked from commit d61e902aab92c262e6c8ee9cd70aec4493cf6cae)
+
+commit 053f32d92864870cd5714befb419810976729df3
+Author: Colin Guthrie <cguthrie@mandriva.org>
+Date:   Tue Dec 16 17:44:27 2008 -0500
+
+    Fix compilation with -Werror=format-security
+    (cherry picked from commit 6d8ea5104cf97dbf64612f58fc06f94f869ed5ec)
+
+commit 8ed4ca2801ece271a4ad7c73a7c0e1329f69ade8
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jun 17 16:10:51 2008 -0400
+
+    XAA: Disable offscreen pixmaps by default.
+    
+    Say Option "XaaOffscreenPixmaps" to turn them back on.
+    
+    Apropos of bugs #13795 and #15098.  But this still isn't correct.
+    (cherry picked from commit 0c6987df3b9b3a37d201d740d8248c326449835e)
+
+commit 32e81074b967716865aef08b66ec29caf0fec2c5
+Author: Robert Noland <rnoland@2hip.net>
+Date:   Tue Dec 16 00:07:42 2008 -0500
+
+    Support -sharevts on FreeBSD
+    
+    Bugzilla #11179
+    
+    Submitted-by: Nathan Whitehorn
+    
+    Signed-off-by: Robert Noland <rnoland@2hip.net>
+    (cherry picked from commit 7aa29b9d66c3cd0f8af4fafbe92efd0c0556d225)
+
+commit 4c68079c2ae8a2f04363623c44d17bc8c255c3bf
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Sun Dec 14 18:58:33 2008 -0800
+
+    GLX: Changes resulting from changes to Mesa generator scripts / data
+    
+    Several recent Mesa commits (listed below) make modifications to the
+    protocol generator data and scripts.  This commit represents the
+    changes to the generated files resulting from the previous changes.
+    
+        - 0f73302d24f4201813da2939742c5bcb6964b3b1
+          GLX: Fix protocol for glTexSubImage#D
+    
+        - 1709ab01ef24279c782e420568e9257b4b92b224
+          Return 0 as the request size when the pixels parameter is NULL
+    
+        - 63cca2ba10ce7dcc8481cfa4be3872dfc269dded
+          GLX: Include glapi.h before glapitable.h
+    
+    This is the server-side part of the fix for bugzilla #11003.
+    (cherry picked from commit f1c9b5ab230cbb4124d8d476ae4886d05022adcb)
+
+commit 75bad86992338f5ce0ade6986b758cd6af2a5b9a
+Author: Cooper Yuan <Cooper.Yuan@amd.com>
+Date:   Mon Dec 15 10:29:34 2008 -0500
+
+    Fix typo in xf86PickCrtcs()
+    (cherry picked from commit 2a61397d17339113b9e37995b06ca543589814ce)
+
+commit f427d3aaa7ca58822033ac5486b46671a937b68a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Dec 13 00:45:27 2008 -0800
+
+    XQuartz: Updated menu item ordering for better HIG compliance
+    (cherry picked from commit 4c9bb241ce5fb856fab20ae96fa89bd2b71ef242)
+    (cherry picked from commit 73987010b2ef9c67b6614e226c6fae65d834d8f3)
+
+commit d0eb4337e3468a5854e4801fcb1d2bc7d5c4d81f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 10 23:04:30 2008 -0800
+
+    XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
+    (cherry picked from commit 748d9e5bd756513d42c4046f3b31e1fdc55bccb6)
+    (cherry picked from commit fd31984e0c0f9a37087cd1cffaa3ba116b12c2e5)
+
+commit d9e1fdcd40bf12378c9fa05a8adbe3aefca65676
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 10 01:56:01 2008 -0800
+
+    XQuartz: Fix path to executable
+    (cherry picked from commit 7e9d3698e070a0c63dd2556651373c3aca58e2fe)
+    (cherry picked from commit 5926b213b39a90601c73f026dc0699723f5ed10d)
+
+commit e93daf4e7140115f9485c8c0cdc358d50c9575be
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 10 00:00:29 2008 -0800
+
+    XQuartz: fixed make dist
+    (cherry picked from commit 2d52367ab92429e58596d1a1ed3ef52a0a38a7aa)
+    (cherry picked from commit 13eff12902be1b25d0ccc2089e08305f88949f32)
+
+commit 1cf76f23c7d210d75a401568c5ad788a2fd268d1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Dec 9 23:47:32 2008 -0800
+
+    XQuartz: Avoid using login /bin/sh blech.  Just use a bash script to start the app, so it will inherit the right environment
+    (cherry picked from commit f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148)
+    (cherry picked from commit fdf64256127b2661bd6aa81ac694350028d36c43)
+
+commit 22d3ecda18ba799966d08237d8041ad80b20d0f2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Dec 8 21:59:49 2008 -0800
+
+    XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
+    (cherry picked from commit b959727f38733009c6381cc8ca06b5984257bdac)
+    (cherry picked from commit 9cbed0a325175e7ddb751db54fe6c0f5a5cedd16)
+
+commit 9eb5f3092984206ac7cab9a9fdb4b19448db3a24
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Dec 8 21:00:11 2008 -0800
+
+    XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
+    Also some prefix related fixes.
+    (cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)
+    (cherry picked from commit 99b2cbf061a9d074e66e6220dc08f8b4624ea6bb)
+
+commit 19e6f73710776aee0b76dcbd62596a448029611e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Dec 6 12:01:28 2008 -0800
+
+    XQuartz: Removed some debug spew
+    (cherry picked from commit 370dcf11b360b87aa24cace35eb615419057fda0)
+    (cherry picked from commit 8065953ea8c3b7d10c775f6b7fec629bb5a2c83c)
+
+commit ced368287bad65c126cd6a5304969d0a0f9dc4eb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Dec 6 14:11:25 2008 -0800
+
+    XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
+    (cherry picked from commit a41e7f75decd340d064fdc0d2c4fe6c88d7dbc82)
+    (cherry picked from commit 70930f6d31cc2ca16b40c17e101b106506a8337a)
+
+commit b5687a9d129f6eea7ebe590120f9d90f9d7ed48b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Dec 5 12:42:31 2008 -0800
+
+    XQuartz: Corrected name/command labels in the customization widget
+    (cherry picked from commit a689c23f17eb445c36b97eb617ef4b8bd157985f)
+    (cherry picked from commit 9ac2e68d86ed1eb6e3f6c900c60908813eca140e)
+
+commit 53d93d0d29f0bef6b2b7e312fb09e498b68636f9
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Dec 2 14:54:10 2008 -0800
+
+    Removed unised option from configure.ac for launchd
+    (cherry picked from commit 87e4de0a9a8af6e5e0cbba74e585761f1160a6ab)
+    (cherry picked from commit 451050b1e2dc0f2f6356d74ddb6f52183a794e8f)
+
+commit df3f23fe8d13be74e58c894c44683024a190b0f6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Dec 2 14:53:21 2008 -0800
+
+    XQuartz: pbproxy: Simplify linking
+    (cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
+    (cherry picked from commit cbb9ee57f8f29d2a1c39946381471fcd3b8e495e)
+
+commit 6e8626f2eb31a3699bf49597974e01ea4757f31e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Dec 8 15:58:15 2008 +1000
+
+    Xi: silence compiler warning
+    
+    Don't mix declarations and statements.
+    (cherry picked from commit fb2a8d0e59a3d187255538f6add22ec67551507a)
+
+commit e56059dfa5f2835625b9f74a2af1f128d6eaf265
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Dec 4 09:47:25 2008 +1000
+
+    xfree86: fix compiler warning (use of uninitialized variable)
+    
+    drv and idev are only set for SDs, but are only dereferenced for SDs too, so
+    initializing them to NULL is safe.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit 8e3279134987a45f2a89c963ef2d33bc3d3c8179)
+
+commit 0d12c44d832b98da10dccc3b8bac7676d8ea2c96
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Dec 1 16:57:06 2008 +1000
+
+    xfree86: don't render SW cursors for devices attached to VCP (#16805)
+    
+    When leaving 3D games such as quake3 or sauerbraten, a cursor may stay on the
+    screen. This is caused by one run of SW rendering for the SD, even though the
+    SD was attached to the VCP and thus has HW rendering capabilities.
+    
+    Check for the SD's attachment (like in all other functions) before deciding on
+    SW or HW rendering.
+    
+    X.Org Bug 16805 <http://bugs.freedesktop.org/show_bug.cgi?id=16805>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit bb072019fa8dd292a50ef433d05caeefd1304a73)
+
+commit 63b3bf85ed4e11ace433e6aa21b311cce7144007
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Dec 3 15:06:37 2008 +1000
+
+    xkb: Allow NULL as rulesFile in XkbSetRulesDflts.
+    
+    If no rules file is given, simply re-use the previous one. If no RF is given
+    the first time this function is called, use the built-in default.
+    This includes fixing the built-in default to something that actually exists.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit 463e02e7de5da3e582a3a049110a476713c7210e)
+
+commit 9a44cc619f3296b0faca97b0959e19c208f143bb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Dec 8 14:16:00 2008 +1000
+
+    Xi: don't update VCP's valuators from DeviceValuator events #18882
+    
+    The VCP doesn't need to update the valuators anyway since it cannot send XI
+    events. Just skip that bit.
+    
+    X.Org Bug 18882 <http://bugs.freedesktop.org/show_bug.cgi?id=18882>
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c7fffe9e1354f816b6e2adedff045999fba9f1be
+Author: Stuart Bennett <sb476@cam.ac.uk>
+Date:   Fri Dec 12 00:08:44 2008 +0000
+
+    dolt: allow older versions of bash to compile the xserver (#19031)
+    
+    Signed-off-by: James Cloos <cloos@jhcloos.com>
+    (cherry picked from commit 7be6520d94df874c6bbd46d06a1830a12d0967f2)
+
+commit ca56d764d2be28c64fe15c9e37d534ef00117ad2
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Dec 10 16:13:20 2008 -0500
+
+    xsync: Fix wakeup storm in idletime counter.
+    
+    Wakeup scheduling only considered the threshold values, and not whether
+    the trigger was edge or level.
+    
+    See also:
+    https://bugzilla.redhat.com/show_bug.cgi?id=474586
+    http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
+    (cherry picked from commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5)
+
+commit a82f10c5dd9fa74ff18759ab288bbd9c8b7ac4de
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 8 17:42:47 2008 -0500
+
+    randr: clear primaryOutput when the output is deleted
+    (cherry picked from commit 86c64ddf21763972aa7fc8c5770259123c9907b3)
+
+commit 2bc53ce66828b6c177e3298fa2f326c77c93e136
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 8 17:40:07 2008 -0500
+
+    randr: use primary output for RRFirstOutput()
+    (cherry picked from commit fe65f400ed16cb39db8c9518b9446f590c34db1a)
+
+commit f0234a9eb88ed103bca7db73a833c472ab95b48f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 8 17:37:17 2008 -0500
+
+    randr: Mangle GetScreenResources sort order based on primary output
+    (cherry picked from commit cdcb516e561e2f65eb2fa523ca001c57674d5caf)
+
+commit 2ef02833d614c42693e019a444560e84f501b5dc
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 8 17:28:55 2008 -0500
+
+    randr: Mangle compat Xinerama reply based on primary output
+    (cherry picked from commit d7b316e82bc7051f8829b4f4a640f50ae91c2db9)
+
+commit 0bdfdaa7df8105c7ffc3248a4fdd5f64da67103c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Dec 9 10:51:37 2008 -0500
+
+    randr: Add [GS]etOutputPrimary
+    (cherry picked from commit 9d58d2a319059989ccdfa758f586149ccdc16df6)
+
+commit 09039fb89f3fd047f10b575e019bba6762448456
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 15 19:53:45 2008 -0800
+
+    Patch brown-bag fix for bug 19017 (scrn->virtualX/virtualY 0 before PreInit)
+    
+    When a driver uses a crtc during device detection, the scrn has not yet been
+    configured and virtualX/virtualY are still zero. This caused the X server
+    to try and allocate a shadow frame buffer, which couldn't work.
+    
+    Detect this by checking for zero virtualX/virtualY values.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 063eb6743cd0d98dd52d1a9559b804381ee5144d)
+
+commit ae2cbbff9fa0f458e133bf1894d8a7f9fb3fbb72
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 15 11:39:24 2008 -0800
+
+    Use scrn->virtualX/virtualY in xf86CrtcFitsScreen. Fix bug 19017.
+    
+    pScreen->width/height are not initialized when doing initial mode setting,
+    which makes this function incorrectly fail. Using scrn->virtualX should work
+    in all cases though.
+    
+    Bug 19017 reports a crash in xf86CrtcSetModeTransform when doing a modeset
+    for output probing, long before the screen array is initialized; that was
+    caused by a work-around to set pScreen->width/height so that xf86CrtcFitsScreen
+    could find the right values.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit fde2f961035609cfff8761ef1e0f23e6a9761be2)
 
-commit b8fd8da1ad985988426d0269982751a70535e8d0
+commit 6d671b2dee7d2e5481399f0bdb3323a0250a075d
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 15 11:38:00 2008 -0800
+
+    When disabling SIGIO tracking, use SIG_IGN instead of SIG_DFL.
+    
+    This avoids a race condition for drivers which mis-order the fd close and
+    signal disable.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 29a5b0596b396d3e4a8a014cacd3e3ef77467ab7)
+
+commit 8f17a31aa721e42925cd6b4616ccad90497818f3
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 15 11:36:43 2008 -0800
+
+    Clean up rotation data when crtc is turned off
+    
+    The shadow frame buffer and other data used for rotation need to be freed
+    when the crtc is disabled, not just when rotation is disabled.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 1ba4cbb15919759aadd71960c5c057af9ba94fe3)
+
+commit be21199f550d9a19c10df16ed23c6f9ed94e55da
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 11 18:48:02 2008 +0100
+
+    randr: Fix initial panning border copy
+    
+    Thanks to Julien Cristau for finding this.
+
+commit 19a978359d7358501cccb79965b78a3f8ec18743
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 11 17:51:20 2008 +0100
+
+    randr: Oops, miscalculated panning rectangle's coordinates
+
+commit ab56607a0855e88de2ad2d7eb43e1d806db0c47b
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 11 16:48:40 2008 +0100
+
+    randr: Update initial screen size if panning information is present
+
+commit 657d963a663a189d3c8068a39528b2d73af5fe70
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 11 16:48:11 2008 +0100
+
+    randr: Fix error message for bad panning config
+
+commit 44b89dc0a5aa23df69539754fb76c67c310530db
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 11 14:56:51 2008 +0100
+
+    randr: Add monitor option "Panning" for initial panning configuration
+
+commit 523aae1fa6d8002e55e85aee49f113b7eb9a6df3
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Dec 9 22:10:56 2008 -0800
+
+    Bump version to 1.5.99.3 (1.6 beta3)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4810226dfc52ef798b507d284030b4b3aec020a6
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Fri Dec 5 15:37:15 2008 +0100
+
+    randr: Update SProcRandrVector for panning
+    (cherry picked from commit 44bef8b850c5a78a3d3eca5f0d92b71bdd0a87e2)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 798a4878a4ffb03024e77ea6ddbd9b170b9c3fe4
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 4 18:13:40 2008 +0100
+
+    randr: Allow panning to be disabled per axis
+    (cherry picked from commit e5ab9e66628cde081757cf2a1013a78e927a622e)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5fa2cce83cc2df560ce62ec4bbf88233ee70e64a
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 4 16:55:14 2008 +0100
+
+    randr: Rework panning area verification
+    (cherry picked from commit bad118ace6c5bae5a5ed8a35129c90c38f1c1932)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 97e8a75ce3c70e7a83028b256b6884084f5e196b
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 4 16:28:40 2008 +0100
+
+    randr: Don't change panning parameters if verification fails.
+    (cherry picked from commit 219c26ce0c65625d55cfd943ec66fe94a1a0ddfd)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6189f0832ecd6930608f5b253e534bb104174694
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 4 16:30:38 2008 +0100
+
+    randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()
+    (cherry picked from commit 18a8bac1a1567b6215928f96870554ea63f39aab)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 68858b202a0c32e8cc3fb22ca4714c1baa05b44c
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Dec 4 16:11:21 2008 +0100
+
+    randr: Nuke config-timestamp for panning
+    (cherry picked from commit 825b2c2f4a59ac4852f90bbbddf18ab832297fdd)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7cbded550d3bebc35e2322a89d0afbb57b37b3da
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Fri Nov 28 17:51:20 2008 +0100
+
+    randr: Protocol bits for panning support
+    (cherry picked from commit eeeb98d1df59baaaec954b6318d788a37e388d11)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bc05471d1184ebf72b793b1dceff9856eba616d2
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Fri Nov 28 17:49:31 2008 +0100
+
+    randr: Panning support
+    (cherry picked from commit b929d721efdb17bcc94b9984c4f34d0df3d267d5)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f7e2fee8fe9b47f1e898feb8419aacd9a32c1f01
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Fri Nov 28 17:39:23 2008 +0100
+
+    randr: Crtc interface update for panning support.
+    (cherry picked from commit 834cbc16f3eb539704faade7bff347b161ce69d9)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 27ca32eb05101e0e5624422dd25e1aa95b129d77
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Fri Nov 28 17:38:52 2008 +0100
+
+    randr: Weird enough, crtc->version was never set upon creation. Fix that.
+    (cherry picked from commit a475eb9feec75e9ce1e316da0f1679acd7dd3aa8)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0d27dd23cf08a2dc3581f9db81371c2cdb798db0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 8 16:28:00 2008 -0500
+
+    Default to x86emu even on i386 linux
+    
+    vm86 mode is a bad idea anyway, and using the emulator everywhere
+    means we get a consistent set of bugs.
+    (cherry picked from commit 58a27d2932164e43c0db42b1286ec2f95250b420)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ff9b55d8cbc19e0e31a91034e332058acd967cd1
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Mon Dec 8 12:24:39 2008 +0100
+
+    ddxCtrls.c: XkbDDXUsesSoftRepeat always returns 1 now
+    
+    We'd like to do soft repeat in the server for all keys. Remove obscure check, that'd
+    prevent the server from autorepeating when delay is set to exactly 660ms and rate is
+    set to exactly 25 (interval=40).
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    (cherry picked from commit bbf811514d3cdf84790bad5b852942a4e636902b)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b0c64725526338cbc02708415e1aa9497cdc3a38
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 26 14:15:04 2008 +1000
+
+    xfree86: don't FatalError on "too many input devices".
+    
+    Just ignore devices after MAXDEVICES has been reached, but warn the user that
+    the devices are ignored.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit db5abde7ea0e482041d16d7d5f3715cd4f6222d3
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Dec 5 10:12:57 2008 +1000
+
+    dix: fix calculation of valuator events.
+    
+    Follow-up to 4971315296cb. countValuatorEvents was copied from GKVE where it
+    was obviously broken but nobody noticed. GPE had the correct version, but that
+    one got lost during de-duplication. Restoring the correct calculation - if we
+    have 6 valuators, we want 1 valuator event, not 2.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit ee1a6c28418a6dad6c89f79a994f27bfbaa77368)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d679cf70a79aa53e823f4fa51a7ab19837f26525
+Author: Tom Jaeger <ThJaeger@gmail.com>
+Date:   Mon Dec 8 11:38:12 2008 +1000
+
+    Xi: XIGetDevice needs to ignore the MORE_EVENTS flag.
+    
+    Reported in X.Org Bug 18882, Comment 5.
+    <http://bugs.freedesktop.org/show_bug.cgi?id=18882>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 78a62d7713c708d067d8824ec41b0a0225c1997f)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 480caacbdd20d47770cc9a698be9f7c98e87783d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Dec 8 12:12:39 2008 +1000
+
+    xfree86: init EQ before trying to initialise the devices (#18890)
+    
+    The kbd driver may send events during device initialisation, and these events
+    need the EQ set up already.
+    
+    X.Org Bug 18890 <http://bugs.freedesktop.org/show_bug.cgi?id=18890>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 39db182b637041255ed6dac739ff77c8e4e07c30)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 991f0be6e2bfe3cc3df55b2fc75fe3900d5e0b94
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Sat Nov 29 14:30:55 2008 +0100
+
+    randr: Avoid needlessly creating a shadow framebuffer.
+    
+    - pScreen->width and height were zero, so it didn't "fit" the screen.
+    (cherry picked from commit ffb484f7ef84099019b196ef97bfb2355eb6d52a)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d6129ebf8dad9cfbc13dc8db7c780b023bf9a60b
+Author: Timo Aaltonen <tjaalton@cc.hut.fi>
+Date:   Wed Dec 3 18:40:29 2008 +0200
+
+    If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.
+    
+    Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi>
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit dd128ddcdcbe254a9cdd973590f6a979a7f0427e)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 90900976ceee294fef4ae39e10869057c50f2021
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Wed Nov 26 21:19:55 2008 +0100
+
+    randr: add swapped dispatch for RR[GS]etCrtcTransform
+    
+    Fix a memory leak in ProcRRGetCrtcTransform() while I'm at it.
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+    Cc: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 0b5ecabfb803cd820338fb0364521fe39b05578b)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit de83a342f483fbf3cc841929876002a3c47e3496
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed Dec 3 11:22:38 2008 -0500
+
+    Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.
+    (cherry picked from commit 110a71d11ab7a1a55a6a24d792457fdef0b0746d)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3df1db67e37094ef263134a86ee82a36fc52f990
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Dec 3 11:31:48 2008 +1000
+
+    Xi: change XIUnRegisterPropertyHandler to XIUnregisterPropertyHandler
+    
+    CamelCase can be taken too far, and AFAICT there's no consumers of that
+    function yet anyway.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ba666a969e938daa2176c12c4959393789b0a98d
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Dec 9 20:36:41 2008 -0800
+
+    Revert "dmx: claim we support XI 2."
+    
+    This reverts commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b268458eab2f213ec14dfe8013aa714c187e3aab
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Dec 2 23:43:02 2008 -0800
+
+    Bump version to 1.5.99.2 (1.6 beta 2)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d68632e2213adc0945dcdfca2e93f68aeab97457
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Dec 2 14:32:48 2008 -0800
+
+    Add atKeynames.h to libdmxinput_a_SOURCES so it's included in tarballs
+    
+    Reported by geearu in #xorg-devel
+    (cherry picked from commit c1db925d10fd37077bed90612ed95c3fd20cd2e2)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f5ef57e5fef0be80d660c26ed370f608b4444a5e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 1 11:36:06 2008 -0500
+
+    randr: Don't send output property events on server exit
+    
+    If the Window resource type is already gone, there's no point in trying
+    to send events, all it can do is access already-freed memory.
+    
+    Relevant thread:
+    
+    http://lists.freedesktop.org/archives/xorg/2008-November/040443.html
+    (cherry picked from commit b0d371ab0a6efd4956c3677faa20b2ac15c33765)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 40116cd5d0c205f4e8ab340dca80e38f8b78dddb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Dec 1 20:02:34 2008 -0800
+
+    More man page updates for 1.6 release for Xorg, xorg.conf & exa man pages.
+    
+    - Remove remaining references to XFree86-Misc options AllowNonLocalModInDev
+      and DisableModInDev.
+    - Remove remaining references to grab-breaking keys & associated options.
+    - Update description of Ctrl-Alt-Backspace to new -retro/DontZap defaults.
+    - Add description of new options -modalias and -showopts.
+    - Update list of modules loaded by default.
+    - Update input driver references from keyboard to evdev & kbd.
+    - Update list of driver man pages to match xf86-*-* drivers with man pages.
+    - Add See Also section to exa man page.
+    
+    and various formatting/typo/etc. fixes.
+    
+    The Xorg/xorg.conf sections on input device selection could use further
+    updates to better match the current state of HAL-enabled configuration.
+    (cherry picked from commit 8c560422b44e012053612754430d2b87dc44ed59)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4e5be5ad368b140d189fb69d394cf0c901f34d83
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Dec 1 19:19:04 2008 -0800
+
+    Correct warning for unknown GlxVisuals option in conf file
+    (cherry picked from commit 6a1850b8c677e2a2993f6f6b731ee3d35aa55d09)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ca744c371a138cfd19e826ba7f3847f32139ad64
+Author: Jay Cotton <jay.cotton@sun.com>
+Date:   Mon Dec 1 16:06:09 2008 -0800
+
+    Sun bug 6618220: Xorg server core dump in xf86RandRModeRefresh(NULL)
+    
+    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6618220>
+    (cherry picked from commit 5f3f14179edf48aad518f6f707bfdc37c27267c6)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 78af5d81e818f4ac2fb43d9683fa634b3d1f7fc5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Dec 1 16:28:45 2008 -0800
+
+    Update See Also lists in Xorg & xorg.conf man pages
+    
+    Remove xorgconfig & xorgcfg
+    Update driver lists:
+    	- Remove vga
+    	- i810->intel
+    	- via->openchrome
+    (cherry picked from commit 24c562f04b41d219c34f5fa3f963564accf329f2)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e40841ce5afa0678b74b9eff37c7d304758309b6
+Author: Bernhard Rosenkraenzer <bero@arklinux.org>
+Date:   Tue Dec 2 09:01:56 2008 +1000
+
+    Xext: fix MultiBuffer compilation error with TryClientEvents. (#18835)
+    
+    X.Org Bug 18835 <http://bugs.freedesktop.org/show_bug.cgi?id=18835>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    (cherry picked from commit 1dfed222e93f4684c2a450944a9a0ea9e085c43f)
+
+commit 0d902b05ad910cada46dcc2b85d8b0148aed35e6
+Author: Stuart Bennett <sb476@cam.ac.uk>
+Date:   Tue Dec 2 22:52:53 2008 -0800
+
+    xf86Cursors: xf86_reload_cursors shouldn't unconditionally show hwcursor (#14820)
+    
+    Also, no need to call ShowCursor when SetCursorPosition already does it
+    Based on a previous patch by Maarten Maathuis
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit 0b8f8b24f718820a72ebdc52423c2e6a44e848c5)
+
+commit cbf4fec52960ffd74b78ea45d0b917c76f553ebf
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Dec 1 20:53:17 2008 -0500
+
+    Bump dri2proto requirement to 1.99.3.
+
+commit 670ac5d097c64d4f09ee3861d1ff21d5d6af3fdf
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Dec 1 20:52:41 2008 -0500
+
+    Drop unused DRI2 vblank infrastructure.
+    
+    For this first iteration of DRI2 we don't have any vsync functionality
+    in place yet, so back out the support in DRI2 and the protocol for now.
+
+commit 862d5b2dc55e678921b3db710b2821b66d55ea2f
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 26 12:20:00 2008 +1000
+
+    xkb: don't attempt to filter events for devices without key classes.
+    
+    Reported by Magnus Kessler.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 41471afa7774a6598344ea7b488f993a0bd32e7f
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 14:55:15 2008 +1000
+
+    xkb: Extra sanity checks to prevent dev->key == NULL dereferencing.
+
+commit b983c4fa1ec13f6096badf9dd5ebbf55880bb6c1
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 26 21:35:34 2008 +1000
+
+    Require inputproto 1.5
+    
+    Also claim to now support XI 1.5.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit f245c46d291dc22f40fb839bf21d2620091a84ef
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 14:21:05 2008 +1000
+
+    dix: don't detach SDs during grabs.
+
+commit 71f289f7d1b4fe79f25b229830047e71f50d8610
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 14:05:58 2008 +1000
+
+    dix: Don't deliver XI events from MDs.
+    
+    Restore the XI 1.x event model: VCP/VCK deliver core events only, SDs device
+    events only.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit c910886737bf6ce7a4bd44d2149a1f0a810453d2
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 13:49:40 2008 +1000
+
+    Xi: Purge XGE remainders, we don't have any XGE events anymore.
+
+commit be4bf65d00a28cc77b939f00f115528a9024ab89
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 09:22:04 2008 +1000
+
+    input: don't switch MDs' classes around between SDs.
+    
+    Server 1.6 uses the X Input 1.x input model, where the core devices (VCP and
+    VCK) do not generate XI events. They don't have to swap device classes but
+    instead stay at the default number of classes at all times.
+    This means we can get rid of the DeviceClassesChangedEvents as well.
+
+commit aba1cbaadcde50a7a25f8aee06b66eec67a9145e
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 09:19:49 2008 +1000
+
+    dix: No DeviceEnterLeave events in server 1.6
+
+commit 9739fac04520e3e0c338f74cedb58855a17fc899
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 09:38:49 2008 +1000
+
+    Xi: don't allow VCP/VCK be OpenDevice'd, but allow all SDs.
+    
+    Reverting to traditional XI behaviour.
+
+commit 7330cb56501defb0002815767d2dc7f5b2b8ca1c
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 09:35:48 2008 +1000
+
+    Xi: don't list attachment in ListInputDevices, but list all SDs.
+    
+    In XI2, we only list the VCP and the VCK as well as floating SDs to non-XI2
+    clients. This is not the case here, we just list all devices.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 1d307ed7f268d3bb511985c18d580ab8a104ed41
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 28 09:34:56 2008 +1000
+
+    Xi: remove the GetExtensionVersion hack - don't reply with supported version.
+    
+    XI2 abuses the GEV request to reply with the min/major version of the
+    supported extension if the length for the name is 0. Don't do that, yet.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit cfe7301bcf134ade26a81764be2ca5890eb29d5d
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 26 21:40:05 2008 +1000
+
+    Xi: remove all new XI2 protocol requests and their handling.
+    
+    This commit reverts to XI 1.4 requests, plus the input device property
+    requests.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit db115e78705e59a376c6c425e7cb97cfb14ff2ac
+Author: George Staplin <gstaplin@apple.com>
+Date:   Fri Nov 28 13:57:45 2008 -0700
+
+    XQuartz: GL: Make various changes to makeFormat, so that it works better.  Now glxgears looks normal with the old libGL.
+    
+    Add various GLX extensions to the list of supported extensions.
+    
+    Reformat the oddly formatted code in some areas.
+    
+    Use xalloc and xfree instead of malloc and free.
+    (cherry picked from commit 755f53eb40c4329d8c82a31cb910c31fdd4ea12e)
+
+commit d4fb734c631a20e93da22773e676f747c9f645ba
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 28 12:59:09 2008 -0800
+
+    XQuartz: Added option to enable/disable test extensions
+    
+    defaults write org.x.X11 enable_test_extensions -boolean true
+    (cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9)
+    (cherry picked from commit 635019ad18db921fec99256294debd8571074abf)
+
+commit e9ee5d4f61794d8d12109b44daa92868cb834954
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 28 11:18:14 2008 -0800
+
+    XQuartz: Avoid some warning messages being spewed to system.log by AppKit
+    (cherry picked from commit 780eff230ce41ad785e54d61a82c731269ae0446)
+
+commit 2ca2742aa588d48348971e7e7c4b75cae4a4f5ad
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 28 01:45:37 2008 -0800
+
+    XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
+    (cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
+
+commit added4cff7069f0c9d6b7047c6435d1599003ccb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Nov 26 12:15:58 2008 -0800
+
+    XQuartz: Fix dead-acute on Greek keyboards
+    (cherry picked from commit 807f2ec35c5f95b56b3e2b5eac51aec300fe5cb6)
+
+commit 202908c6139b806bc599cd74f3b68172c14aa7b5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Nov 26 12:07:52 2008 -0800
+
+    XQuartz: Fix Czech keyboard dead-acute
+    (cherry picked from commit 771df2786bc60389489f0967e705c7c95bdda085)
+
+commit c7c8eeaedc8dc24c3ed7930d4322eb811977536e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 20:14:37 2008 -0800
+
+    XQuartz: Fix an uninitialized keyboard_type on Tiger
+    (cherry picked from commit 27b1a5eb3482052253ebdce1a09aedf05ac1b099)
+
+commit f0e7a792bedbf9fe9844298ac74445a8116c52aa
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Nov 26 15:49:02 2008 -0800
+
+    Add server support for RRGetScreenResourcesCurrent
+    
+    This depends on randrproto 1.2.99.1
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    (cherry picked from commit fc708394318ed92c612e2938b335c08c1ffebb28)
+
+commit f3edc1fb0210149f35eab4e413700b5c4ac48214
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Nov 25 23:15:35 2008 -0800
+
+    New version of dolt
+
+commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b
+Merge: 9ffc671 ed597f1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Nov 25 22:19:08 2008 -0800
+
+    Merge commit 'origin/master'
+
+commit 9ffc6719390df8fdd0a5295a7a7a0eaea792be45
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Nov 24 13:08:48 2008 -0800
+
+    Move matrix operations from X server to pixman 0.13.2
+    
+    pixman 0.13.2 now holds all of the matrix operations. This leaves
+    the protocol conversion routines and some ABI stubs in place
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ed597f19fdc3017dde6d1452b5cdf8ddcd69a5b1
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Nov 25 19:36:31 2008 -0500
+
+    xselinux: use "raw context" variants of getpeercon() and getcon().
+
+commit ec1d08442f69353cb0e73ac4eaf0346ebb975594
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Nov 21 15:13:00 2008 +1000
+
+    dix: Enable core devices in InitCoreDevices already.
+    
+    Updated patch, see
+    http://lists.freedesktop.org/archives/xorg/2008-November/040540.html
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2b45602e828a07a0817691b2838cd34ffee531bd
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 26 10:42:52 2008 +1000
+
+    Revert "dix: Enable core devices in InitCoreDevices already."
+    
+    I merged the wrong patch. See correct patch at:
+    http://lists.freedesktop.org/archives/xorg/2008-November/040540.html
+    
+    Not activating the device before attempting to enable it would leave the
+    sprite unset, crashing the server when enabling the real devices.
+    
+    This reverts commit e078901a4eca02bd3e7a80d9462dafbca939a187.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 416685c295353b5816689994c7c58ae7db3e878d
+Author: Jeremy Uejio <jeremy.uejio@sun.com>
+Date:   Tue Nov 25 16:26:44 2008 -0800
+
+    Refix Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
+    
+    <http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
+    
+    This is a refix of the previous fix for CR 6685465.  In the first fix
+    I was shifting the colors to match the mask by the bits_per_rgb amount
+    in the visual structure.  That field has nothing to do with the # of
+    bits to shift by.  I should just instead shift the bits to match the mask.
+
+commit d5f9a131a2d5bd33f82fdd4e809880b0ff792b45
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Nov 25 15:46:39 2008 -0800
+
+    Fix const-mismatch warnings for DisplayModePtr's
+    
+    Includes fixes for:
+    "xf86Config.c", line 2434: warning: argument #1 is incompatible with prototype:
+    	prototype: pointer to struct _DisplayModeRec: "xf86.h", line 351
+    	argument : pointer to const struct _DisplayModeRec
+    
+    "xf86EdidModes.c", line 312: warning: argument #1 is incompatible with prototype:
+    	prototype: pointer to struct _DisplayModeRec: "../../../hw/xfree86/common/xf86.h", line 351
+    	argument : pointer to const struct _DisplayModeRec
+    
+    "xf86EdidModes.c", line 438: warning: assignment type mismatch:
+    	pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
+    
+    "xf86Modes.c", line 701: warning: assignment type mismatch:
+    	pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
+
+commit d5ad296869c38ab30136b5a293a0125b76aad994
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Nov 25 14:12:26 2008 -0800
+
+    Remove duplication from code paths in XkbDDXCompileKeymapByNames
+
+commit 2538fc0d893a150e978355d281750f0a989728a7
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Nov 25 18:18:46 2008 -0500
+
+    xselinux: don't pass a NULL key string to selabel_lookup().
+
+commit c8472a74441838e16d0d3414db1fa7fe996868a9
+Author: Michael Vogt <michael.vogt@ubuntu.com>
+Date:   Tue Nov 25 19:35:17 2008 +0200
+
+    Do not send VisibilityNotify events when MapUnmapEvents are disabled
+    
+    This prevents a protocol visible side-effect (XVisibilityEvent) on
+    XCompositeRedirectWindow() followed by a XCompositeUnredirectWindow().
+    
+    The problem shows up in gnome-screensaver with compiz and "unredirect
+    fullscreen windows" enable. A VisibilityNotify event is generated (first
+    with obscured and than with unobscured) when the window swithces from
+    redirected to unredirected.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=18133
+    http://launchpad.net/bugs/278112
+
+commit 88297558aada44bc714ad57adbeed3740aaadee5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 14:20:58 2008 -0500
+
+    Dead code cleanup over DBE.
+    
+    No DDXes have explicit DBE support anymore, so the init registration
+    table never got used.  Just nuke it all.
+
+commit e5eaea599ab16428c69912b6b3427ebe46707d7c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 14:05:51 2008 -0500
+
+    Warning fix
+    
+    xf86info.c:11: warning: initialization makes integer from pointer
+    without a cast
+
+commit 37072500f7bcf39e0d6aa2ceb5d1f2aeeab0b26b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 14:04:44 2008 -0500
+
+    Warning fix
+    
+    helper_exec.c: In function ‘port_rep_inb’:
+    helper_exec.c:219: warning: implicit declaration of function
+    ‘DEBUG_IO_TRACE’
+    helper_exec.c:219: warning: nested extern declaration of
+    ‘DEBUG_IO_TRACE’
+
+commit d96bffce2dcf209e76be9b36ca1ede7e0c976d77
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 13:59:00 2008 -0500
+
+    Warning fix
+    
+    Init.c:139: warning: no previous prototype for ‘ddxBeforeReset’
+    
+    Just declare the prototype always, seriously.
+
+commit 09ea671cbff605fd2b2af71619e7db5002108bf8
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 13:40:47 2008 -0500
+
+    Warning fix
+    
+    lnx_bell.c:37: warning: no previous prototype for ‘xf86OSRingBell’
+
+commit a9853c7d337b3b1ad49793e9b4b90e313b6fa536
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 00:53:55 2008 -0500
+
+    Warning fix
+    
+    Pixmap.c: In function ‘xnestPixmapToRegion’:
+    Pixmap.c:93: warning: ‘Box.x1’ may be used uninitialized in this
+    function
+
+commit 81eafe9f93a272b06aa9f9235ec5676b9aa3ee3e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 00:45:07 2008 -0500
+
+    Warning fix.
+    
+    vbe.c: In function ‘VBEReadPanelID’:
+    vbe.c:1145: warning: return from incompatible pointer type
+
+commit 09bfb25e031772611a2f0902d4ba77b587e4bdb2
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 00:43:36 2008 -0500
+
+    Remove unused XAAAvailableOptions
+
+commit 8b9253f6383df3fefe38bde43a5f892b158a77c4
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 00:38:47 2008 -0500
+
+    Code motion: subsume xf86DoProbe.c into xf86Init.c
+
+commit fbabb1c5c243cfd8c954dec4c060dff1a0b81015
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 00:34:28 2008 -0500
+
+    Warning fix.
+    
+    In file included from l3-xaaStipple.c:4:
+    ./xaaStipple.c:35: warning: no previous prototype for
+    ‘XAAGetStippleScanlineFunc3LSBFirst’
+    
+    etc
+
+commit cbaca6ec666d7349c4680b8affc13b5c9cae1fa5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Nov 25 00:14:24 2008 -0500
+
+    Remove dead FreeModuleDesc.
+
+commit eb474adf98229a43bbe17ab98ff084371cb9fa09
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 11:25:58 2008 -0800
+
+    XQuartz: Simplify the xquartz_resetenv_display path
+    (cherry picked from commit d2e0624dd30eb234bb25595ceedfa51d48ca1724)
+
+commit 94df1ab7f09a64f57c1e1453e3640462e984619c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 01:30:03 2008 -0800
+
+    XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
+    (cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
+
+commit 0b314c50a2a0ca1afbdc06663c3b719b05ebb851
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 01:13:35 2008 -0800
+
+    XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
+    (cherry picked from commit b4add7826d485600a13eba6a9c7be533f2c02d51)
+
+commit 065d2afb0ca34f89806e0936c51cd27805bc5123
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 00:51:01 2008 -0800
+
+    XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
+    (cherry picked from commit 7a8c6665949d7804a97ef2539a74ec4aa682e1cc)
+
+commit 13df49dca28cf680a4d104630cd675de25d3e944
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 00:39:52 2008 -0800
+
+    XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD
+    (cherry picked from commit fbf4b0d33fa5dc618c3191a4e823232dfa33cd95)
+
+commit 40187f782beae4ae751824ef511c9f56a80357c7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 00:20:57 2008 -0800
+
+    XQuartz: Dead code removal
+    (cherry picked from commit eeb323612e0adbea37befed31bbaa1d295728385)
+
+commit b55cad4569e34e3c10e9a327e20b91ea87d9dd98
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Nov 25 00:15:53 2008 -0800
+
+    XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
+    (cherry picked from commit 3a500d9247cf34686ec17b4a88c34d51ecd38ecd)
+
+commit d508a3dcca2f160021aced872715e1ded23cef97
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Nov 24 23:33:54 2008 -0800
+
+    XQuartz: More dead code removal
+    (cherry picked from commit dcb0f6a2e62823a671051874d14a33ce59505892)
+
+commit 41fbdf72f2154a3fca8cf484a611501e3c174fbe
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Nov 24 12:33:20 2008 -0800
+
+    XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
+    (cherry picked from commit 73ec6d3dfe0086d352f4eca25f1df5ae1884bb18)
+
+commit 09c3f6e04c273ffafcb547c252137fb17c8ce016
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 22 20:23:46 2008 -0800
+
+    XQuartz: Dead code removal
+    (cherry picked from commit 46c077d9b4a883fc809c32077ce40f33a70d268b)
+
+commit ab12c7516207908f3e063a78904d68e2db14208e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 22 15:47:14 2008 -0800
+
+    XQuartz: More Tiger cleanup: bootstrap_strerror
+    (cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622)
+
+commit 208f091bfc657e9ee57b988f035d3aac7e9e173a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sun Oct 12 00:07:56 2008 -0400
+
+    Remove xf86IODelay
+
+commit 47478aa10adb20b6e48335ac8c4ef31f3fdfe68c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 23:59:24 2008 -0400
+
+    Remove xf86{En,Dis}ableInterrupts entirely
+
+commit c7680befe5aebd0f4277d11ff3984d8a7deb9d5b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 23:35:24 2008 -0400
+
+    Remove the remnants of Jensen support
+    
+    As being an EISA-only machine, and as ISA support is gone now...
+
+commit df14682a31b92751091571ed82f6095f55f19cca
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 22:48:51 2008 -0400
+
+    Bus: Remove ISA support.
+    
+    No, really.  PCI is old enough to drive now.  If you want this, get the kernel
+    to expose a framebuffer device.
+
+commit a8bcab2d3b224e4d4d5b6a097ea530beee920213
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 22:14:23 2008 -0400
+
+    Bus: Remove yet more unused overlap processing.
+
+commit 994b7c034fc20d76651cf7f6a285526d9aff8770
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 22:11:12 2008 -0400
+
+    Bus: Don't pretend to care about IRQs, DMA, or PCI config space
+
+commit eb5ae45127fa9f08f0badec7e21f8c26c9c7c969
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 21:44:16 2008 -0400
+
+    Bus: Simplify a failure case (that pretty much never happens)
+
+commit ee8b5cf94c2a9f8526a3bb5011ebb10f3246a4d9
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 21:41:47 2008 -0400
+
+    Bus: Trust the kernel when registering driver resources
+    
+    ... everywhere, not just (linux && (ia64 || alpha)).
+
+commit 8397df89456558e3c85b05e0acfccb9f6af6b695
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 21:36:14 2008 -0400
+
+    Remove unused MIN macro
+
+commit c251c0baae59714a6ac83b69cd106c08baa3613e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 21:34:27 2008 -0400
+
+    Bus: remove special handling for init-only resources
+    
+    This isn't used by any driver, nor has it ever been as far as I can
+    tell.
+
+commit 3e5281af17841cf50d0e52a728b12c6ab56e61df
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 21:16:45 2008 -0400
+
+    PCI: Unexport xf86scanpci
+
+commit 6b198daa46f2f609aff7900761cf82cc2fb4e0b4
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Oct 11 20:51:39 2008 -0400
+
+    Bus: remove useless isaConvertRange2Host
+
+commit a96db74c2a95bb1dce132cf47ea720ae939dfad7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 9 00:43:26 2008 -0400
+
+    Bus: Don't try to find an ISA bus just for fun.
+
+commit b21311a99d58997cd1fc68726d0848242e9c34fc
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 9 00:34:42 2008 -0400
+
+    Bus: Remove unused RemoveOverlaps
+
+commit 41be6b3f0dc0baa1c6ae8d2b41a6be73ca0e7268
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 9 00:33:28 2008 -0400
+
+    Bus: Remove the notion of estimated resources.
+
+commit 095ba1435501776c8c8a34e767b89f89e5dc949a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 9 00:27:33 2008 -0400
+
+    Bus: remove the "reducer"
+    
+    This code effectively didn't do anything anymore.
+
+commit 4457e31710af90f9ac295bb686c841e9473fb767
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 9 00:14:54 2008 -0400
+
+    PCI: Remove unused ia64 platform code.
+
+commit 86cfe0ee236bfd3613e5f9ba589211db42d009eb
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 23:45:40 2008 -0400
+
+    PCI: Simplify OS PCI function registration a bit.
+
+commit 2d427b9cb1594f8f2f66b463033fff5b459962fd
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 23:38:23 2008 -0400
+
+    PCI: Remove config mechanism details.
+    
+    pciaccess handles this for us now, no need to remember PC arcana.
+
+commit 5bb86bafd6fda296011cbcd5d15a85a6d770ae29
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 23:34:41 2008 -0400
+
+    PCI: Remove non-pciaccess path for x86.
+
+commit a67360e79fa7e17c3d907771694009c57c1cd195
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 23:31:38 2008 -0400
+
+    PCI: Always build domain support.
+
+commit 51e105ccc3d0ac8c0fe74efd029ffbddb80b140e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 23:12:31 2008 -0400
+
+    Remove xf86GetResourcesImplicitly
+
+commit 599a0f3f1e3ae92676e3648471576c0001cfd9ae
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Nov 24 20:37:58 2008 -0800
+
+    Fix typo in 5bf2c88d2317230b95b2904cb975167d03ee13a2
+    
+    Amazing how these things hide until you see the diff come back from
+    the commit list.
+
+commit 5bf2c88d2317230b95b2904cb975167d03ee13a2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Nov 24 20:34:46 2008 -0800
+
+    Simplify filename generation code for Xorg -configure
+
+commit 75784e1e53ad78e21518696dd9d297bc08c17d54
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Nov 24 20:32:20 2008 -0800
+
+    Solaris: Make KDSETMODE failure non fatal, and retry it on interrupts
+
+commit 3e6da1636093d7dc98baac40544c0b0fb7fd8aec
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:55:57 2008 +1000
+
+    include: remove ENTER_LEAVE_SEMAPHORE macros.
+
+commit b292a7a2d7e259177e1cc37346c2bee27a018630
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:44:29 2008 +1000
+
+    dix: updated enter/leave core event model.
+    
+    As proposed by Owen Taylor [1], the enter-leave event model needs to adjust
+    the events sent to each window depending on the presence of pointers in a
+    window, or in a subwindow.
+    
+    The new model can be summarised as:
+    - if the pointer moves into or out of a window that has a pointer in a child
+      window, the events are modified to appear as if the pointer was moved out of
+      or into this child window.
+    - if the pointer moves into or out of a window that has a pointer in a parent
+      window, the events are modified to appear as if the pointer was moved out of
+      or into this parent window.
+    
+    Note that this model requires CoreEnterLeaveEvent and DeviceEnterLeaveEvent to
+    be split and treated separately.
+    
+    [1] http://lists.freedesktop.org/archives/xorg/2008-August/037606.html
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 724f83b87bb16472d4c328e35d2a477384b29f84
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:29:01 2008 +1000
+
+    dix: add FirstPointerChild, FirstPointerAncestor auxiliary functions.
+    
+    FirstPointerChild: Return the first child that has a pointer within its
+    boundaries.
+    
+    FirstPointerAncestor: return the first ancestor with a child within its
+    boundaries.
+    
+    These are required for the updated enter/leave model.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 7d3e595f93dcd3d334e766a9dea602c05affdbaf
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:27:19 2008 +1000
+
+    dix: Add EnterWindow, LeaveWindow, HasPointer auxiliary functions.
+    
+    These replace the ENTER_LEAVE_SEMAPHORE_* macros. Unused currently.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 6bdc963cdabb4a2e77de7f00a1d062aa2b873f9b
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:37:35 2008 +1000
+
+    dix: split enter/leave event handling into core and device handling.
+    
+    Device events always need to be delivered, core events only in some cases.
+    Let's keep them completely separate so we can adjust core event delivery.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 5e48f5e2dd2dec7cfd1fa40b61e25123dfca515e
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:41:59 2008 +1000
+
+    dix: remove unused EnterLeaveSemaphoresIsset.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 868fd503b7aeab31dba72046b59061008d8b7501
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 14 15:18:56 2008 +1000
+
+    dix: move Enter-Leave related functions into new enterleave.c
+    
+    Preparation for the new core enter/leave model.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit c4b9ab6bf56139fdd8c7c584a6f523c6766cddd6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Apr 29 08:29:42 2008 -0700
+
+    Handle transform failure when computing shadow damage area.
+    
+    PictureTransformBounds can fail, when this happens, damage the entire screen
+    so that the shadow gets repainted correctly.
+
+commit 9c7679240ad90367693a462e288308b3fdc08f26
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Mar 30 19:05:07 2008 -0700
+
+    [randr] don't try to compute crtc transform when no mode is set.
+    
+    Dereferencing the NULL mode pointer would cause a crash. As these transform
+    matrices won't be used while the CRTC is disabled, just leave their values
+    alone.
+
+commit 315b6d0a425d0257f226ee7032aca3ca31665e59
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 27 11:46:39 2008 -0700
+
+    Update RandR global transform when driver notifies of transform change.
+    
+    Need to compute and save the global transform when the driver changes it.
+
+commit 5d9282fde919c936816a85c2a9c5734dc9d57cc2
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 27 11:45:53 2008 -0700
+
+    Export rrtransform.h as needed by randrstr.h
+    
+    When the transform management was moved from randrstr.h, the associated
+    header file became necessary to build drivers. Include it as a part of the
+    sdk headers.
+
+commit 7236fd9dd4e9f5c4cb5bafa5c2a18cff12a0444c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 21 03:16:09 2008 -0700
+
+    Be careful about copying transforms around; they have allocated memory.
+
+commit 7e69e364d2ef146d8ec3651d04bdd6d641017449
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 21 03:15:00 2008 -0700
+
+    Fix rotated/reflected cursor positions.
+    
+    Doing projective transforms required repositioning the cursor using the
+    hotspot, but that requires relocating the upper left corner in terms of said
+    hotspot.
+
+commit 93179c214fc6ed88f72955a11c69ae0a47316d8c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 21 03:14:47 2008 -0700
+
+    rrtransform needs randrstr to get RANDR_INTERFACE defines
+
+commit 7c61db66a470a8306e346ed8bf8934f014dada42
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 21 02:39:49 2008 -0700
+
+    Create rrtransform.[ch]. Add RRTransform argument to RRCrtcNotify.
+    
+    Instead of using a separate function to notify DIX about transform changes,
+    add the transform to RRCrtcNotify so that the whole Crtc state changes
+    atomically.
+
+commit fa6a1df209bd74da1d545982cca437afc2198cc1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 21 02:35:28 2008 -0700
+
+    Avoid overflow in PictureTransformPoint. Fix PictureTransformIsIdentity.
+    
+    PictureTransformPoint computes homogeneous coordinates internally, but fails
+    to handle intermediate values larger than 16.16. Use 64 bit intermediate
+    values while computing the final result at 16.16 and only complain if that
+    result is too large.
+    
+    PictureTransformIsIdentity was completely wrong -- it was not checking for
+    identity transforms at all.
+
+commit 6fe9c15731be5f5afabacb3aa3ed71b840f4238b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Mar 19 12:15:39 2008 -0700
+
+    Allow drivers to set crtc transforms.
+    
+    Track curent transform down in the mode setting code so that it may be set
+    separately from RandR.
+
+commit 49db14e4ac26070ed86088419483888dda18b603
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Mar 19 00:46:35 2008 -0700
+
+    Handle RandR transform matrices in floating point.
+    
+    RandR matrix computations lose too much precision in fixed point;
+    computations using the inverted matrix can be as much as 10 pixels off.
+    Convert them to double precision values and pass those around. These API
+    changes are fairly heavyweight; the official Render interface remains fixed
+    point, so the fixed point matrix comes along for the ride everywhere.
+
+commit 6f734aecaec4f5c6152c3ebca197ef65bb4523da
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Mar 18 16:06:06 2008 -0700
+
+    Eliminate inverse matrix from randr transform protocol
+    
+    It is easier, and potentially more precise, to compute the inverse in the
+    server where everything can eventually be kept in floating point form.
+
+commit 197aa784694992f6bcfd194932309e440334c237
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Mar 18 15:35:44 2008 -0700
+
+    Report whether transforms are support from driver through extension to client
+    
+    Add APIs to xf86RandR12 support and randr extension to record whether the
+    driver supports transforms, report that value in the RRGetCrtcTransform
+    reply.
+
+commit e86c34663ef97e946a1129450105efa89a123af6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Mar 18 15:25:31 2008 -0700
+
+    Clear shadow pixmaps before using them.
+    
+    This eliminates some ugly flashing, as well as clearing the borders when the
+    shadow will not be completely painted.
+
+commit 97ab0c6eff870b52c0383b63a78cec49059b2545
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Mar 18 15:15:40 2008 -0700
+
+    When converting from double to fixed, round carefully.
+    
+    This reduces the matrix representation error after inverting a
+    transformation matrix (although it doesn't eliminate it entirely).
+    
+    Perhaps we should extend Render to include 64-bit floating point transforms...
+
+commit 6d3a9e40a4b9ec455af11cce31e4aa616c93db32
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 23:04:49 2008 -0700
+
+    Compute matrix inversion instead of using wire version in RRCrtcTransformSet
+    
+    It doesn't make sense to have the client invert this matrix when the server
+    can do so reasonably efficiently. This avoids weird fixed point rounding
+    errors when testing the transform against its inverse. Now to fix the
+    protocol.
+
+commit 160252d94f04acc95f0a4e0f884ff565a5aa0744
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 23:03:56 2008 -0700
+
+    Add matrix inversion function (uses doubles)
+    
+    The obvious matrix inversion function, coded using doubles to avoid fiddling
+    with fixed point precision adventures.
+
+commit 8fd82c88e3f2060fda4ba30376900ece77668c63
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 16:14:43 2008 -0700
+
+    Adjust transformed cursor position to account for hotspot
+
+commit eb222e64128034df8361d5a82d4f4aa1318923ce
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 16:14:15 2008 -0700
+
+    Actually use filter kernel size to expand transform redisplay box
+
+commit 3fdb963f6e8287edeb4c5bc7bbadbc02eb8bb910
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 16:13:25 2008 -0700
+
+    Correct bilinear filter kernel size (should be 2x2)
+
+commit ee6326a6b89b2d223f6e1eaf02aac1fe8aebfaf6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 15:22:06 2008 -0700
+
+    Handle filter widths in xf86Rotate
+
+commit ddc8466137d229fdc100cc403f492c7d61a1ba89
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 15:21:26 2008 -0700
+
+    Initialize and cleanup new filter fields in xf86Crtc.
+
+commit 16c093afd4f6b30d889cacdc994b0024f9bd83d5
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 15:20:52 2008 -0700
+
+    Pass filter kernel size through transforms
+
+commit 1df02d7ddd44f84bcaefd6583af1a9141cb3c78b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 15:19:17 2008 -0700
+
+    Add kernel size to Render filters.
+    
+    This width/height value lets filter users know how far the filter spreads
+    into the source image.
+
+commit 40f3dff6b350fe0be55ebf7dbca88a0ef8f6380f
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Mar 17 13:57:47 2008 -0700
+
+    Use transform when computing scanout size of modes
+    
+    Report transformed crtc sizes through RandR and Xinerama. Test screen size
+    against transformed mode sizes when configuring the Crtc.
+
+commit f50349e1930e620cacdf27a6f8585fcb9cb5199a
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Mar 15 00:36:45 2008 -0700
+
+    [RANDR] Support filters in CRTC transforms.
+    
+    Create new RRTransform datatype to hold all of the transform related
+    information, use that in lots of places to pass filters around.
+
+commit acda790e430b2a18c7c35379f6e538f3d01ff221
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 14 13:46:30 2008 -0700
+
+    [render] Split out filter finding from filter setting.
+    
+    To prepare for RandR using filters in transforms, split out
+    code paths so that the RandR code can validate the filter name and
+    parameters during the transform set operation so that use of the filter
+    later will not have unreportable errors.
+
+commit e3d6f279d5c305dfb81ca109fbfb665870712d2f
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 13 21:31:12 2008 -0700
+
+    Wire up RandR CRTC transform protocol, bump server to RandR 1.3
+    
+    This involved removing a pile of matrix code from the DDX,
+    as well as moving a bit of transform logic from DDX to DIX.
+
+commit ff9d1cd843a9b0aba69a3d788b21d5f6af702590
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 13 21:30:18 2008 -0700
+
+    Add funcs to convert between protocol and pixman matrices
+
+commit c2f254da694731ea573aa8bbc2707c083743f2d4
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 13 21:29:19 2008 -0700
+
+    Randr now depends on Render for matrices
+
+commit f547650328287545a7a4d96df8d6a6c606dd95a9
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 13 14:50:13 2008 -0700
+
+    Export a bunch of matrix operations from render.
+    
+    The render extension uses many matrix operations internally, this change
+    exposes those functions to other parts of the server, drivers and
+    extensions. The change is motivated by the 'transform' additions to the
+    RandR extension but will likely be useful elsewhere.
+
+commit e063162e80e51ed4368874b3af7ba690ea280d9e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Mar 13 14:26:01 2008 -0700
+
+    Add projective transforms to RandR DIX/DDX API.
+    
+    New RRCrtcGetTransform function in DIX that DDX can use to get the pending
+    transform. The DDX code should be complete; the DIX code is just a stub at
+    this point.
+
+commit 9c7ac47b871a71e42d2f6933749ca462f1a65b40
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Nov 4 00:10:08 2008 -0800
+
+    Notify DRI when crtc regions change
+    
+    Drivers that care about crtc positions on the screen to ensure that vblank
+    works correctly need to be notified when crtcs are changed.
+    
+    Provide a hook in the mode setting code that is invoked whenever any
+    configuration is done to the screen.
+    
+    Use this new hook in the DRI code so that DRI clients are notified and
+    receive updated information.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 554592cd70543f87cd8bee5ff47cc8281511e041
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Nov 24 11:50:38 2008 +1000
+
+    DGA: silence compiler warning.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 0dbcbd35f63db14734199a0beb2a91b6937f3838
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 21 12:02:02 2008 +1000
+
+    xfree86: Split the working code of NIDR into new xf86NewInputDevice.
+    
+    The xfree86 server previously hat NewInputDeviceRequest and InitInput, and
+    both basically did the same thing. Reduce NIDR to parameter checking and use
+    xf86NewInputDevice from both InitInput and NIDR to actually create the device.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit e078901a4eca02bd3e7a80d9462dafbca939a187
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 21 12:39:55 2008 +1000
+
+    dix: Enable core devices in InitCoreDevices already.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit d939f2482e71ad20bac28b7aa4b2e8c8196e9d65
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 21 12:21:45 2008 +1000
+
+    dix: fix false comment.
+    
+    VCP and VCK are always present, this comment is a leftover from earlier MPX
+    days.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 387563b77743d92be83420d982eaf57f5459a883
+Merge: 85f650c f6e01fa
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Nov 23 13:15:46 2008 +0100
+
+    Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver
+
+commit 85f650c9b76ab2e244f01908a7941c320635becd
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Nov 23 13:14:27 2008 +0100
+
+    missing action in if statement.
+
+commit f6e01fa1b87ea190ea5ad723ce46893784ea1de4
+Author: Stefan Dirsch <sndirsch@suse.de>
+Date:   Sun Nov 23 11:16:03 2008 +0100
+
+    Added '-showopts' option to print available driver options (#5564).
+
+commit 8964b8d0ec2b7b3b6bf540cd647b14a20e8f64a5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 22 14:23:23 2008 -0800
+
+    XQuartz: More 1.6 server API updates
+
+commit ad0f232165fe1a25ca4fb6da817da02b6ce31779
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 22 14:04:28 2008 -0800
+
+    XQuartz: Fixed --disable-glx
+
+commit 8e2287c220694953e972cd5119c2b0cd256b7a30
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 22 13:57:45 2008 -0800
+
+    XQuartz: Updated some code to use newer server API
+
+commit 6eb33bc0cb2e62339d323e1f1894015d7e3142f3
+Author: George Staplin <gstaplin@apple.com>
+Date:   Sat Nov 22 11:37:08 2008 -0700
+
+    XQuartz: GL: Remove the inclusion of glcontextmodes.h.
+    
+    Add some commentary about future directions needed for the GLX drawable
+    creation and destruction code.
+    
+    Match xalloc with xfree.
+    
+    I made some minor formatting improvements.
+    (cherry picked from commit b772d64fce31d16b498c621096e39d5203994d6e)
+
+commit 429b4b20d5708d608fd55f91dd5bcd4ac0b51a12
+Author: George Staplin <gstaplin@apple.com>
+Date:   Sat Nov 22 10:57:58 2008 -0700
+
+    XQuartz: GL: Add a branch to prevent a NULL DrawablePtr structure access.
+    
+    In attach() check for pDraw being NULL, and also print an ErrorF message,
+    because we eventually want to track down why this is occuring.
+    
+    It's unclear how this occurs, but as I noted in the 1.4 branch, I believe that
+    the DrawablePtr/struct _Drawable -> id is the member being accessed that causes
+    KERN_PROTECTION_FAILURE at 0x0000000000000004
+    
+    This passes my tests using: env LIBGL_ALWAYS_INDIRECT=1 ./sometest.
+    
+    I fixed a warning: caused by initializing the screen->base.visuals with the
+    configs.  It is a ** not a *.  It seems that some other part of GLX will
+    initialize this for us.
+    (cherry picked from commit 17f6a261fca6d5856069dce28bb4838261afc6bc)
+
+commit bc0c7075e29b1719409cf7de8a4ab9ae1315aa67
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Nov 22 19:10:09 2008 +0100
+
+    Remove the old libusbhid copy from os-support/bsd.
+    
+    This has been replaced by in-kernel support for USB mices several
+    years ago and hasn't been enabled in build since X.Org 6.8.
+
+commit 76fcfc480133726112049e5bd9c3082d46825918
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 20:25:55 2008 -0800
+
+    XQuartz: GLX: sync up indirect.c to match George's updates in the xorg-server-1.5-apple branch
+
+commit 1a717779b67b9c1cdf734eef64135ac38829f726
+Author: George Staplin <gstaplin@apple.com>
+Date:   Fri Nov 21 17:28:11 2008 -0700
+
+    XQuartz: GL: remove glcontextmodes.* from the Makefile.am.  It has been replaced.
+    
+    The new replacement is __GLXconfig.
+    (cherry picked from commit 3bed9b65c807a1aeb662b8042826cbb54280181d)
+
+commit dacad9ae0bdaedff9403fbe84a5c5a4b4eef3542
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Nov 21 17:16:22 2008 -0800
+
+    Xephyr man page typo fixes.
+    
+    Also trailing white space removal to clear git warnings.
+
+commit ca64b5949d229a60a3c62b6d29d51873b7694bd6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 11:20:31 2008 -0800
+
+    XQuartz: Don't use LS to find X11.app on Tiger.
+    (cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560)
+
+commit 701f8e3a94d2b659ebcfffd09acd1d66f9e797b8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 11:08:00 2008 -0800
+
+    XQuartz: Update applewm deps
+    (cherry picked from commit 0ad91c59be8759a9c9e9d4f639056d8c689a3bc5)
+
+commit 393325f908f8bd6648e466183f3683a2d80b264e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 10:57:31 2008 -0800
+
+    XQuartz: spewCallStack is noop on Tiger now...
+    (cherry picked from commit 56c469a68b92c6cf003802f418ea00bd596a41c3)
+
+commit 5d47a5d6526b7e52387647a15a580dfcafd1733f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 10:54:55 2008 -0800
+
+    XQuartz: pbproxy: Added some typedefs for types not available on Tiger
+    (cherry picked from commit 0947aa7911f1de44bfe16e505a757b659c5ab2a8)
+
+commit b262788401715787c68cea4ca79f4b270307afee
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 10:53:39 2008 -0800
+
+    XQuartz: More Tiger ifdefs
+    (cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
+
+commit 510744444329170f702d31d43997a6bbc1591b44
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 21 10:44:11 2008 -0800
+
+    XQuartz: Resurrect the old audio path for Tiger
+    (cherry picked from commit a61a8d9047e8765faf3892f4f2148c8553fd192c)
+
+commit d7ee76f9dd84da05b59591a971b96bf990136767
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Nov 19 11:42:59 2008 -0800
+
+    XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
+    and just have the AppKit thread wake it up.
+    (cherry picked from commit 799715b8f3327c8da59ab45706e85af2d2c438e4)
+
+commit a9e20306fbe3262602f21b876a52a1ef38cdf20a
+Author: Egbert Eich <eich@ovid.suse.de>
+Date:   Fri Nov 21 18:50:01 2008 +0100
+
+    int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.
+    
+    When the linux kernel sets the NX bit vm86 segfaults when it tries to execute
+    code in memory that is not marked EXEC. Such code gets called whenever
+    we return from a VBIOS call to signal the calling program that the call
+    is actually finished and that we are not trapping for other reasons (like
+    IO accesses).
+    Use mprotect(2) to set these memory ranges PROT_EXEC.
+
+commit a54153e669fd293a47f0077bf25505dd545ddce2
+Author: Rémi Cardona <remi@gentoo.org>
+Date:   Fri Nov 21 16:39:00 2008 +0100
+
+    xfree86: don't reset Auto(Add|Enable)Devices, use defaults from xf86Globals
+    
+    Without this, commit ace38fafb062372dcd3d56378b5b8f86525c6241 is useless
+    when HAL support is disabled.
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 6a1b2fed7e465a9c652e8ee250b8eab440945862
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Sep 28 12:18:16 2008 +0200
+
+    Add a man page for Xephyr, with information from the README file.
+
+commit 10d472bf9d61bef32d0a383b2e3783e7a1d7621f
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Mon May 19 05:15:30 2008 +0200
+
+    Support for BSD apm
+    XXX check amd64 pci init
+
+commit f4e725f248870a2de10449cc8f53de32e7840d45
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Nov 20 13:51:15 2008 +1000
+
+    dix: memset DeviceVelocityPtr to zero.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 7f818776b7a19bd6100596d327ecaa69be317bc6
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Nov 19 15:05:50 2008 +1000
+
+    dix: fix typos in comments, one formatting fix.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 037ec5a3c496b07f885a128828ef804b3aa8eee2
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 19 15:12:04 2008 +1000
+
+    gitignore: ignore .patch files
+
+commit ace38fafb062372dcd3d56378b5b8f86525c6241
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Nov 18 08:19:45 2008 +1000
+
+    xfree86: without CONFIG_HAL, Auto{Add|Enable}Devices and AEI is false.
+    
+    There's little chance that we'll get the input devices at runtime without HAL,
+    we might as well force the server to add mouse/kbd devices automatically -
+    just like in the olden days.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 1cd894173ee7fa3d1a78d330c12453ea53e7b908
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 19 13:44:26 2008 -0800
+
+    Always use server-<display>.xkm to avoid races when multiple servers start
+    
+    Previously each server starting ran xkbcomp with the output set to
+    <keymapname>.xkm, read it, then deleted it - which led to races if
+    two servers were starting at the same time with the same keymap.
+    
+    Sun bug #6773816 Xorg uses the same xkm output file for compiled keymap file
+      <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6773816>
+
+commit 1e4412abc499b9938bbac8a3ecd82f7f12d448d9
+Author: Rémi Cardona <remi.cardona@lri.fr>
+Date:   Mon Nov 17 09:56:49 2008 +0100
+
+    drop unused HAVE_LIBDRM_2_2
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit c4ec71b405fcb5132d5089e3f8dd7b00c235265a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Nov 16 17:57:46 2008 -0800
+
+    XQuartz: pbproxy: nuke RCS Id, update header license/copyright
+    (cherry picked from commit 477c6968a88429bb9c10222a5836bdc936d10ab1)
+
+commit 42f330cf9ef44aea7428a67d282dfb1a60196e55
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Nov 16 10:42:03 2008 -0800
+
+    XQuartz: pbproxy: Remove thread-main.m
+    
+    it got accidently added and isn't used.
+    (cherry picked from commit cb6ffce68a2d10022fa92725d2d1837da4b3b89f)
+
+commit 19aac4274bbac55ce944acfaf3274a4403fe392e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Nov 19 10:55:29 2008 -0800
+
+    mi: Push screen-saver/DPMS handling to after the EQ pop operation.
+    
+    This way we on't need to hold the mutex during the dixSaveScreens() call.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 56d1793c435abbaababab031860f1160f09fff06
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Nov 19 10:54:57 2008 -0800
+
+    mi: Only increment tail (push) when the event data is actually in the queue
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 570835b9a89187a36e08defbccc56051bb349b52
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 19 10:19:20 2008 -0800
+
+    Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
+    
+    Depends on commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 to get
+    definition of xf86InitVidMem on Solaris.
+
+commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Nov 18 14:21:01 2008 -0500
+
+    Xinput: use floats for ConstantDeceleration and AdaptiveDeceleration
+    
+    These values need not be constrained to integer values.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 08cd361234ed0410f67342f46ae01120c4fe3331
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Nov 17 10:28:48 2008 +1000
+
+    exa: avoid doing prepare/done without intervening copies in exaFillRegionTiled
+    
+    This does a precursor check to make sure the copies are required before
+    entering the prepare/done code.
+
+commit 8f8a9c19ad58768b07461a3f4bccea98f7c4f958
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Nov 17 10:24:39 2008 +1000
+
+    EXA: avoid copy operations if no boxes in use
+    
+    Simple fix for now, I'm sure damage shouldn't be calling us with nbox = 0.
+
+commit 03f7a66a1ae3f522a49bcc783066d53d69c97262
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 15 19:45:49 2008 -0800
+
+    XQuartz: Don't use TIS on Tiger...
+    (cherry picked from commit be8ac84c15e7e76c581b9e75cda74139394aa4c7)
+
+commit e8112784e8ef80a96ed54eca7e148b424001a38f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 15 19:52:34 2008 -0800
+
+    XQuartz: Integrated xpbproxy into the server.
+    
+    Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
+    The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
+    (cherry picked from commit 42944936326ef8732f622db9f75b79a92980550d)
+
+commit 24928b85dc996c8d0a052ddf383df25718ee5305
 Author: Michel Dänzer <michel@tungstengraphics.com>
-Date:   Tue Nov 4 11:27:53 2008 +0100
+Date:   Sat Nov 15 13:28:53 2008 +0100
 
-    AIGLX: Reinstate call to driver texOffsetFinish hook.
+    DRI2: Don't crash in DRI2ClipNotify when DRI2DrawablePtr is NULL.
+
+commit e5271c374715dd4e9a724ab3e5f77108d4ce8c23
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Sat Nov 15 13:27:42 2008 +0100
+
+    Set libdrm flags correctly even when only DRI2 is enabled.
+
+commit bc4f804cd86497655f6765b0954e64dc959939e3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 14 15:13:22 2008 -0800
+
+    XQuartz: Actually add glcontextmodes.[hc]
+    (cherry picked from commit 763195d338345e3637d112279bdbe002b6e7791a)
+
+commit aedafbea0e1c7bc780ebe7ae878f62525769aca8
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 20:21:24 2008 -0700
+
+    fix compilation on systems that don't have
+    XP_EVENT_SPACE_CHANGED defined
+    (cherry picked from commit 6e833e41e2f3a84f7e5164b918737b3975517c12)
+
+commit b0789365719f48c0b477b4703f2072f932246b76
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 14 14:57:09 2008 -0800
+
+    XQuartz: Initial work on readding GLX to the 1.5 server
+    (cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
+
+commit 1d7049f8fd3c0798250b9213149d3ce0b37ab77f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Nov 13 12:45:35 2008 -0800
+
+    Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
+    (cherry picked from commit 7dff93ec1ac92aeaf3b70d5cfe787fa4a28c0dba)
+
+commit 3c124832642f1ec3228a57bea3d1eda68a188ff3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 20 10:37:17 2008 -0700
+
+    XQuartz: Made X11Application.m a little more tidy.
+    (cherry picked from commit 3520386261b838196a8918e8bee16bdccbc9781d)
+
+commit e917806fc556c2054b2835c8f85770b554c78092
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Nov 14 10:56:21 2008 -0800
+
+    os/connection: TRANS_NOXAUTH bit comparison brainfart fix.
     
-    It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
-    is a regression fix and should probably be backported to server-1.5-branch.
-    (cherry picked from commit a4d62bbf215894bad8e19d99f7330c637d3d49e3)
+    https://bugs.freedesktop.org/show_bug.cgi?id=18524
+
+commit 17bccff4ce905f46c074fd8ee7c6567b1371a0a1
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date:   Fri Nov 14 12:36:20 2008 -0500
+
+    [dix] Remove a duplicate statement.
+    
+    Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit ba4e08244ed3923eecf26842dfc1df17c696e053
+Merge: 81fd17f 5bad5d2
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Nov 13 15:04:18 2008 -0500
+
+    Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/./xserver
+
+commit 81fd17f5f49cdd2c10d0bf3b7ddeb8b5953886a5
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Nov 13 15:00:30 2008 -0500
+
+    Only add default modes if EDID supports continuous-frequency
+    
+    When an EDID is present, only add the default mode pool if the
+    continuous-frequency bit is set in the EDID.  Should fix bugs
+    like 18512.
+
+commit c232f3d673fb00d7fceb8e82741349d64e5ac0ad
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu Nov 13 14:58:21 2008 -0500
+
+    xf86TargetExact should try harder if there's only one monitor attached.
+    
+    If there's no preferred mode, but only one monitor, pick the
+    biggest mode for its aspect ratio, assuming one exists.
+
+commit 5bad5d2abea2f51cbf53dc8dd016e90ccb086220
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Nov 13 11:32:40 2008 -0800
+
+    XQuartz: Fixed XBell() when not using system alert.
+    (cherry picked from commit aa0e9ab1c7a226cdcb3c5e62be159355a290faf8)
+
+commit 0fca8588a238c91580b305c3671567e910150a02
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Nov 13 11:10:15 2008 -0800
+
+    XQuartz: Added more debugging to handoff spew
+    (cherry picked from commit acefa7e3c8706ffedc052effd50b36ce10e72c22)
+
+commit 47d38218706564d1437dc3ff9d1bba3511db063c
+Author: George Staplin <gstaplin@apple.com>
+Date:   Wed Nov 12 17:17:25 2008 -0700
+
+    XQuartz: GL: Handle the alpha differently when the alpha is equal to GLCAPS_COLOR_BUF_INVALID_VALUE.
+    
+    This prevents visuals with odd sizes.  The machine I use didn't have
+    this problem, but it shows up on some others.
+    (cherry picked from commit ed181382ddeb77019577d39b9c06b1cd839e18e4)
+
+commit 6b501d7cc55f1d06966cdf3caf36bcfc6cf18939
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Nov 13 13:57:30 2008 -0500
+
+    Add missing newline when printing edid info
+
+commit 33edd32702d963802e64d382124eabb9d0352fa8
+Author: George Staplin <gstaplin@apple.com>
+Date:   Sun Nov 9 18:35:10 2008 -0700
+
+    XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
+    
+    Use the settings queried from the system in xprScreen.c, rather than those 2 calls.
+    
+    The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
+    and not all of the visuals were usable with GLX.  Some of the visuals aren't usable
+    with GLX still, such as DirectColor, but that seems to be acceptable based on my
+    understanding of the manual that states "a subset of visuals are made available
+    for OpenGL rendering."
+    (cherry picked from commit 373b8a5f32509722e06d8776109e6c3f06645ee0)
+
+commit 1523476afa6657c20eba112e3ee051d45e721164
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 8 23:32:40 2008 -0800
+
+    XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
+    (cherry picked from commit 54d20f6d33c347bcb37a0a8287c2d92fed2b9092)
+
+commit 1f301a0051d65296189248b2529616d9b33276b3
+Author: George Staplin <gstaplin@apple.com>
+Date:   Thu Nov 13 01:27:33 2008 -0700
+
+    XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
+    
+    It was returning inverted values in comparison to the 1.4 branch.  This resulted in
+    the windows not drawing due to a deep path of: RootlessReorderWindow ->
+    SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
+    AppleWMDoReorderWindow.
+    (cherry picked from commit d1d398db762fe7d5720f9b5fafa2bbe8372fceac)
+
+commit f5841e96487234df5ead5f5c0fb3c587c418cb46
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Nov 11 22:50:35 2008 +1000
+
+    dix: don't store enter/leave and focus semaphores in a devPrivate.
+    
+    We need them for each window, every time a window is allocated. Storing them
+    in a devPrivate is the wrong thing to do.
+    
+    This also removes the unused ENTER_LEAVE_SEMAPHORE_ISSET macro.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 26f701704b4e536cd91bd8a9f7d2194793471998
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 12 16:53:29 2008 +1000
+
+    dix: remove duplicate line in EnterLeaveEvent.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 8ff62ea5ba1bc331c886840b2b1e101cb4f2ebed
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed Nov 12 15:19:09 2008 -0500
+
+    CopySubBuffer expects GL style coordinates.
+
+commit d91243beb63008fff2ce6affa7db091786e8c49a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Nov 7 08:39:38 2008 +1030
+
+    dix: formatting fix.
+
+commit dde09076c5c0c36a4a9321cd23a2c7922c4c755b
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Nov 5 12:52:03 2008 +1030
+
+    dix: remove superfluous variable devgrab
+    
+    grab == devgrab anyway, this is a leftover from the time when we had two
+    different grabs per device (core and XI grab).
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit fc3e8bfb82323477b54181c6d546c90f53f1ebd8
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Nov 4 15:27:30 2008 +1030
+
+    mi: clean up mieqProcessInputEvents, copy all events before processing.
+    
+    Copy the EventRec's information into local variables before processing them,
+    this should make it safer for upcoming threading and also makes it easier to
+    read.
+    
+    Simplify the event allocation code from the abyss it was before.
+    
+    This also fixes a potential bug where a custom handler could scramble the
+    event before the same -now scrambled- event was then passed through the
+    master's custom event handler.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 31005efb1bb6be5a892ff905f754109dc3fa8fe6
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date:   Mon Nov 10 13:23:45 2008 -0500
+
+    input: Remove useless conditional.
+
+commit 24383056d0513cc588cee5cee78f1cba2c0fbe89
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Nov 8 13:04:20 2008 -0500
+
+    Don’t recommend fixing HAL if HAL support is disabled.
+    
+    As reported in http://bugs.freedesktop.org/show_bug.cgi?id=18438
+    the server suggests reconfiguring HAL if AllowEmptyInput is enabled
+    and no input devices are known.
+    
+    Instead of that notice, if HAL is disabled at configure time,
+    AllowEmptyInput is enabled in the config and no input devices are
+    found report those facts and recommend disabling AllowEmptyInput.
+
+commit b3c7e62664457a3802ebc23785446051624a8c2f
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Nov 8 12:18:13 2008 -0500
+
+    Remove some null statements.
+    
+    Remove several doubled statement-terminal semicolons.
+    
+    Reported by Fernando Carrijo.
+
+commit 21c116219cd5c6845a0955f2d88fdb5fab5c17cf
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Sat Nov 8 01:25:14 2008 +0100
+
+    Fix typos which caused exaCompositeRects() to use an incorrect damage region.
+    
+    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18065 .
+    
+    Also, it can bail if either width or height of the bounding box is <= 0, not
+    only if both of them are.
+
+commit 59f9fb4b8c031df69b3592a26b77e744ff4a556e
+Author: Luc Verhaegen <libv@skynet.be>
+Date:   Fri Nov 7 19:11:11 2008 +0100
+
+    XAA PixmapOps: Sync before accessing unwrapped callbacks.
+    
+    When using any XAAPixmapOps, we call into unknown but freshly
+    unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls,
+    we did so without syncing first, exposing us to all kinds of
+    synchronisation issues.
+    
+    I believe that the rendering errors appeared now because *PaintWindow
+    vanished (e4d11e58), and we just use miPaintWindow instead. This
+    takes a less direct route to the hw and ends up at
+    PolyFillRectPixmap, which very often left drawing artifacts.
+    
+    We now sync accordingly, and no longer get the rendering artifacts i
+    was methodically reproducing on radeonhd, radeon, unichrome...
+    
+    Also, in order to allow driver authors to remove extensive syncing
+    or flushing to hide this issue, create XAA_VERSION_ defines, put
+    them in xaa.h and bump the patchlevel.
+    
+    (novell bug #435791)
+
+commit 991c88b7542164194be73573e7644164416ea90c
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Nov 7 17:36:38 2008 +0100
+
+    xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
+    
+    When setting the depth to 24, leave bpp unset so the logic to pick
+    a supported value is used instead of ignoring the driver's preference
+    and forcing 32 bpp.
+
+commit d3d6be4948fa19947fd3b03e6694247109cc0ffb
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Nov 7 18:36:00 2008 +0100
+
+    mi: Fix infinite loop on regen when swrast_dri.so is missing
+    
+    The swrast DRI provider gets pushed on the glx provider stack at every
+    server generation, so the stack turns into a circular list on regen.
+    
+    X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
+
+commit f59352881f315a634f60c9aac885b2764b28b167
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Nov 6 14:41:55 2008 -0800
+
+    XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
+    (cherry picked from commit 980df1b4ff7d4dab9dc1462dc086542265b1fb1b)
+
+commit b4ca9dc2393ace2415163094b916f0d17ecba9ee
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 5 21:58:04 2008 -0800
+
+    When HAL returns a NULL property, print "(null)" instead of a NULL pointer
+    
+    They've promised to fix Solaris printf soon to check for NULL pointers
+    instead of segfaulting, but that won't help people on existing releases.
+
+commit 13d06f5aaf6120c902a323649615c1ce3d1b5359
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Nov 4 12:53:12 2008 -0700
 
-commit 377712dbfce73348ad7f2610df51a1a805536392
+    XQuartz: GL: Add capability detection for depth buffers, and multisampling.
+    
+    GL/capabilities.c: Add handleDepthModes(), and extend
+    handleRendererDescription() for the various depth and multisampling flags.
+    
+    Add initialization of the new config options to initConfig().
+    
+    GL/capabilities.h: Add depth and multisample config members.
+    
+    GL/visualConfigs.c: Add depth and multisampling support to the visual config
+    setup.
+    (cherry picked from commit f527381eea6a8ae6cd791475b2060d21fcf8efb2)
+
+commit 34bb06b292dc8b07d8602941aab3e69a73811314
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Nov 3 19:52:48 2008 -0700
+
+    XQuartz: GL: Work around problems with really deep visuals.
+    
+    GL/capabilities.c: #if 0 (for now) any capabilities above 8 bits per channel,
+    because they introduce drawing problems.
+    
+    GL/indirect.c: Comment out some visual setup code that shouldn't be running, and
+    actually seemed to cause some problems.  The current visualConfigs.c code seems
+    to do a reasonable job of setting up visuals for XQuartz.
+    
+    GL/visualConfigs.c: Make use of the proper visual .class.   Eliminate depth 0.
+    It seems we really just want 24 for now, and 0 I think was a flaw in the original
+    code.
+    (cherry picked from commit 1e5f63f15e13a40a6e69a1505934d10d6990b6a2)
+
+commit 39e82a9b1250b23768136f3c397377a97f8b908c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Nov 2 15:52:22 2008 -0800
+
+    XQuartz: Replace deprecated API usage thanks to Robery Murphy
+    (cherry picked from commit 71dd052412400362793f2f0c7c02bf4f4309738c)
+
+commit b4db46320a437ba8894cb8cfd4ee3abdcc894b01
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 20:18:27 2008 -0700
+
+    XQuartz: version string updated for 2.3.2_beta3
+    (cherry picked from commit 81bb4128570b44d779126a8dffcd3c5620747383)
+
+commit c9051b684b524549eab6d5b88ee3e195a6f6fbe8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 5 18:25:57 2008 -0800
+
+    Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity
+
+commit d63ea510138c8b6de66184c78cda39ed9981fc1f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 5 14:52:29 2008 -0800
+
+    Non-Linux OS'es should default to kbd driver, not now-dead keyboard driver
+
+commit 446d9443cea31e493d05c939d0128a8116788468
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Nov 5 11:51:06 2008 -0500
 
@@ -41,9 +4959,473 @@ Date:   Wed Nov 5 11:51:06 2008 -0500
     Works around a silly bug in the kernel that causes wakeup storms after
     too many keypresses.  Should fix the kernel bug too, but this at least
     keeps the idle wakeup count below 1000/sec.
-    (cherry picked from commit 446d9443cea31e493d05c939d0128a8116788468)
 
-commit 3245bf113619500b7b6cae3a3f31ddd2984cbc05
+commit 6d21fbf00648307208146aca0837ec63ea490659
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Nov 5 11:39:46 2008 -0500
+
+    kdrive: Bye bye Xvesa
+
+commit 9a874a71a791c6110fd57b8a5c083f777a446d0f
+Author: Egbert Eich <eich@freedesktop.org>
+Date:   Tue Nov 4 21:31:27 2008 +0100
+
+    DDX/RandR: When positioning outputs assume width/height = 0 if no modes exist.
+    
+    When a user specifies the position of an output for which no modes exist
+    (for whatever reason) assume that the width and height of this output
+    is 0. The result will be the same as if this output isn't taken into
+    consideration at all and thus should be sane. It will prevent a segfault
+    when trying to determine the width and height of a non-existent mode.
+
+commit a4d62bbf215894bad8e19d99f7330c637d3d49e3
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Tue Nov 4 11:27:53 2008 +0100
+
+    AIGLX: Reinstate call to driver texOffsetFinish hook.
+    
+    It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
+    is a regression fix and should probably be backported to server-1.5-branch.
+
+commit 27f1ad466cd9662d638f4a8e59beafc32a8b2a8f
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Tue Nov 4 11:26:03 2008 +0100
+
+    AIGLX: Don't truncate offset returned by driver texOffsetStart hook on 32 bit.
+
+commit de1a8b68eb10c39a0d4a197107d68d7cc009edb2
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Nov 3 11:30:48 2008 +1030
+
+    xkb: extract the correct device in XkbFilterEvents.
+    
+    If the event is an XI event, we need to work on the correct device, not on
+    the VCK.
+    
+    Adds XIGetDevice(event) function to extract the device from an event.
+
+commit d97239956667f8181f30271759573b75bf455fbb
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:40:41 2008 +1030
+
+    Purge device-based WindowAccess code.
+    
+    Really, this was a bad idea. It's not security, the UI features that would
+    have been cool (e.g. clicking through windows) aren't implemented anyway, and
+    there's nothing you can't achieve just by using plain XI anyway.
+    
+    Requires inputproto 1.9.99.6.
+
+commit cbc6f983959595aa21c9dd72fac6a7070a650ef7
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 14:36:48 2008 +1030
+
+    xkb: when faking mouse button events, fake them on the correct devices.
+    
+    When MouseKeys are activated, keyboard devices may generate fake mouse button
+    events through XKB. Let's get then running through the appropriate paths, i.e.
+    as XI events on the correct device.
+    
+    To make matters more fun, ProcessOtherEvents drops events if the DIX device
+    state cannot be updated accordingly, i.e. all button events from keyboard
+    devices.
+    Hence we need to get the paired MD for the device in XkbDDXFakeDeviceButton,
+    and post the event through the paired MD (usually the VCP).
+    
+    Removes now-unused ddxFakeBtn.c.
+    
+    Note: this patch only half-arsedly fixed button events, motion events are a
+    more complicated matter.
+
+commit 4971315296cbf868dd738c1c0c1c504fcfe1b619
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Nov 3 17:47:36 2008 +1030
+
+    dix: clean up GetPointerEvents and GetKeyboardValuatorEvents.
+    
+    Split into several functions, remove some stale comments.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 6bb0e0a53656db6168a053fb51b242a8640c1461
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 24 16:22:09 2008 +1030
+
+    xnest: I'm sure xfree works fine, even if we're 64 bit.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 67b7e06c4fa4e8dafb64d9f3eb976836d0cc5889
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Apr 25 19:39:48 2008 +0300
+
+    XKB: Remove pointless macros
+    
+    These weren't even being used, which isn't overly surprising, given that
+    they were already in the struct.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit d9ff20e323ba9fb309629ac21946e85709625589
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Oct 23 16:48:15 2008 +1030
+
+    DIX: Remove unnecessary prototype
+    
+    We don't call XkbCopyKeymap from getevents.c anymore, so axe it.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 064ee458c7183eb91ef2e0f262b312ba1e3ad6e5
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat Aug 9 15:54:56 2008 +0300
+
+    XKB: Tiny cleanups to _XkbLookupAnyDevice
+    
+    A couple of coding style cleanups, a warning fix via removing a
+    now-unused label, and also put an else so we don't spuriously trip a
+    condition that should admittedly never occur anyway.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 97c9e6a7139e07a0761be05034fae42fcd65ba36
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Mar 28 17:10:28 2008 +0200
+
+    XKB: Fix thinko, causing warning (erroneously fixed in 5544c51447)
+    
+    newTypes is a local variable which always has an address.  newTypesIn,
+    on the other hand, might be sus.
+    
+    See also 5544c51447f551dfc6df64438873a7ce64743976.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit caf1e6a1c92a2e70de9159f93d6f5b48c202dd81
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Mar 18 10:05:00 2008 +0200
+
+    XKB: Move XKBrules.h to the server too
+    
+    Get our own local copy of this, so we don't have to define XKB_IN_SERVER
+    anymore.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit f4036f6ace5f770f0fe6a6e3dc3749051a81325a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 22 22:40:44 2008 +1030
+
+    Remove XEvIE
+    
+    It's unmaintained and has been broken for quite a while; MPX finally
+    smashed it completely.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 8c3753a0b711b5708b61f64ab4010ca01608d679
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 22 22:29:54 2008 +1030
+
+    A bit of whitespace cleanup in include directives.
+    
+    It's #include <foo>, not # include <foo>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 889a8dc02bbd3926eaf16dce8f844dc58558e982
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 22 22:29:54 2008 +1030
+
+    Xi: XINPUT has been mandatory for ages
+    
+    Ditch all #ifdef XINPUT, since it's always built.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 4cf2f4172abc4bf848c1726e6dac535713e08f0b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Nov 3 12:50:28 2008 -0500
+
+    Add xf86MonitorIsHDMI() helper.
+
+commit a7951a4dad902edea76a5cd68f833f0e48ae804b
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Nov 3 10:00:54 2008 +0100
+
+    AIGLX: Allow 2D driver to prevent zero-copy texturing of a pixmap.
+    
+    The driver can return ~0ULL to achieve this, e.g. if the pixmap doesn't fit
+    into offscreen storage or if its pixel format isn't supported by the 3D engine
+    for texturing.
+    
+    See http://bugs.freedesktop.org/show_bug.cgi?id=17723 or
+    http://bugs.freedesktop.org/show_bug.cgi?id=12385 .
+
+commit f8af66ddb21b4fb1ae5b4f7f852418ca7b0e7aec
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 20:03:34 2008 -0700
+
+    XQuartz: Add option to allow access to the menu in fullscreen mode
+    (cherry picked from commit 637a9f4bd1ff2b55c870a08ead4940df0f9818e5)
+
+commit c5086badf0387d4d5af10882de90a1faa180550f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 18:58:57 2008 -0700
+
+    XQuartz: LP64 related casting fixes from Bob Murphy
+    (cherry picked from commit ea71710aaa7166ab510abe70f2dc47942de0ead7)
+
+commit 20239a4deebccc9f86586ef6b8ef61311a6fa6a0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 18:58:25 2008 -0700
+
+    Rootless: LP64 related casting fixes from Bob Murphy
+    (cherry picked from commit 40441c4e31167932721a79d7ca572caaa1d36e72)
+
+commit ecd55bc859eb5d7c639d5a6d531d9df524124247
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 15:10:34 2008 -0700
+
+    XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
+    (cherry picked from commit c883a78ef0c2e7e29437881db85d3815a89ab874)
+
+commit 4e762b8aa37b588e6cffcdd4a0152090190005e2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 14:39:54 2008 -0700
+
+    Rootless: Force initialization of static variable before use.
+    (cherry picked from commit cece29317269385aa7a0d3047e6f90e6a17d01eb)
+
+commit 9f49f5172d10070ebd4a9e72ac3c5227c6f35853
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 13:00:01 2008 -0700
+
+    XQuartz: Silence pointer debug spam
+    (cherry picked from commit 9ca099e928653b5a0fb745186e17bfcc3d74ccc0)
+
+commit 93298c7f8f73bdb9892da0e41d2c2a67719dc736
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 12:55:46 2008 -0700
+
+    XQuartz: Don't map the menu bar to the screen area.
+    (cherry picked from commit 1115917ada127a1cd6a8b61efe7fd134e2ea85fd)
+
+commit 31907986a6d4dc726d8ce0071f5884ce6cfea33b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 31 12:37:32 2008 -0700
+
+    XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
+    (cherry picked from commit 5fc73b1141eca8b678e54412ca33afa31a76d088)
+
+commit 227d782a1bddfa1393cddd0c73c0288e18645c47
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Oct 30 13:44:55 2008 -0600
+
+    XQuartz: GL: Mark visuals that are slower than others, due to lack of acceleration.
+    
+    This is used in libGL to determine a preferred visual.  glxinfo -v will also
+    report "visualCaveat=Slow" for such visuals.
+    (cherry picked from commit d5c17f585a240be9f9135975738e62951cde3353)
+
+commit 5287602a4161cd036e3125cda09ba750190a0b47
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 29 17:20:11 2008 -0700
+
+    XQuartz: if 0 out a block to avoid thread-unsafe lockups
+    (cherry picked from commit 60d7359a67900ad4601dbc73e07bcd8c803100a5)
+
+commit 93d7cd31c527afbf26f4e039afb6adbb6a60fab7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 29 17:18:05 2008 -0700
+
+    XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
+    (cherry picked from commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7)
+
+commit 0a076b6a7f3c97ff712412eee32e013d3bfd7364
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 18:32:26 2008 +1030
+
+    xkb: remove unused label "out", clean up program flow.
+
+commit 971aef64416058665bc903fee39fea1619cd3727
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 17:05:40 2008 +1030
+
+    dix: FreeDeviceClass() and friends can be static.
+
+commit 3c3a47d0f5ce7fb9548a3eefee9e72488d3ac279
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 17:00:21 2008 +1030
+
+    include: remove unused declaration for RegisterPairingClient().
+    
+    Matching functions got removed in 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee.
+
+commit 7c5dec9f716962a6e67dba99418061cebe10e1d2
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:56:49 2008 +1030
+
+    dix: remove unused GuessFreePointerDevice().
+    
+    Not used since the MD/SD hierarchy was introduced many moons ago.
+
+commit 12599af285a610fb429245798330f2317c75ac2c
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:50:28 2008 +1030
+
+    dix: NextFreePointerDevice() can be static.
+
+commit 5d0a945a030cd7626046e9f6c8d5c6bd170649d9
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:29:42 2008 +1030
+
+    dix: SwitchCorePointer is long gone, bury it.
+
+commit eb014021c2b3604fc67daebd6860b5dc959fabb6
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:27:58 2008 +1030
+
+    dix: PairDevices() can be static, remove from input.
+    
+    PairDevices() is only ever called in EnableDevice().
+
+commit b6b26560d65d9468c89dd046396d9aeb14e1b227
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:23:34 2008 +1030
+
+    Move EXTENSION_BASE and EXTENSION_EVENT_BASE to misc.h.
+
+commit f781a752e642cfe7d08f841b332c3ae507315598
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 16:16:18 2008 +1030
+
+    Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.
+
+commit 245d1c162c7b13c98a9a28dc7ad441366d7e8006
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 31 11:50:47 2008 +1030
+
+    xkb: ProcXkbSetCompatMap should do dry-runs, then normal runs.
+    
+    Was doing only dry-runs, which kinda explains why changing the compat map
+    didn't really have any effect.
+    Fallout from e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Oct 30 20:38:34 2008 -0700
+
+    Refactor Solaris mapping code to work with standard shared/vidmem.c
+    
+    Also merge sun_bios.c into sun_vid.c and upstream Solaris patch to
+    keep aperture device open, to allow mappings to occur after X server
+    has given up uid 0.
+
+commit 2809a56b4bc7f09f132c70dc39c6695495351c4d
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Oct 30 16:05:40 2008 -0400
+
+    xace: Fix an incorrect call to the RECEIVE_ACCESS hook.
+
+commit 0f2fd0577fe2740a32d3a2749e2c3582f891417c
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Oct 30 15:35:33 2008 -0400
+
+    xselinux: send more specific message types to libaudit.
+
+commit 4ce19b4477057a724b548e342d4c6da2b6721824
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 30 16:02:13 2008 +1030
+
+    xfree86: fix xf86ScaleAxis once again.
+    
+    Maybe one day I stop doing stupid patches like
+    a3a7c12fcf8e4ac1418f9ea53f76091f309a721b.
+    
+    So, if X < low, reset to low, and _not_ to high.
+    If X > high, reset to high, and _not_ to low.
+
+commit f12d7ad1647d12ccf92291ebc0607defe6a634a1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 28 12:38:05 2008 -0700
+
+    XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
+    (cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b)
+
+commit 273df54685768f74ed29926e88a63dc9f86744f1
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Oct 27 22:07:00 2008 -0600
+
+    XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
+    
+    It seems that we were calling copy_completed: too soon.  Now we return instead
+    of falling through to the free_propdata, and copy_completed:.
+    (cherry picked from commit 5797d5b662817a3369a74a673f4a7c995cde75cf)
+
+commit 313d87341aff2396645d2c315086d487c0073d27
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Oct 27 20:44:02 2008 -0600
+
+    XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
+    
+    Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
+    That's why it wasn't working.
+    (cherry picked from commit 9be5998ede7427f14dd9597e117b3d6b427ba4e5)
+
+commit 9007d3beea2e2d8b271f696d433cb30e32cda401
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Oct 27 16:34:24 2008 -0600
+
+    XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
+    
+    This may work, unfortunately I don't have test apps that fail.
+    
+    The way it works is by using an NSImage class initWithPasteboard:
+    method, which we then get the TIFFRepresentation of, and convert
+    to PNG or JPEG.
+    
+    The TIFFRepresentation uses NSTIFFCompressionNone; which should be
+    lossless.
+    (cherry picked from commit 8d048cfa956f4a0860250cc836a6748912b37ad8)
+
+commit b742da0b719198a42a086049771792af84f470ca
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Oct 26 13:17:49 2008 -0700
+
+    XQuartz: pbproxy: fixed blocking
+    (cherry picked from commit bb330a1b1c480e89727fb75ff5aeb71f4afc5ee3)
+
+commit c885110aedc19e551de22a526397d77013c3dfcb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Oct 26 10:22:12 2008 -0700
+
+    Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
+    (cherry picked from commit 3647215310f5a52126661b9ec473dcfeed25b40f)
+
+commit e7c26964eef6732c9603b26b7396f95443c5ba8a
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Fri Oct 24 19:12:05 2008 -0600
+
+    XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
+    (cherry picked from commit fe35a3639081dc78ac6cc4123cde37770f6a39fd)
+
+commit 21ea9d82aab8ff0e0d1904d188f96f9cfb2b051d
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Fri Oct 24 18:11:46 2008 -0600
+
+    XQuartz: GL: Add feature detection of color sizes, and accum sizes.
+    
+    This gives us a *lot* more visuals, and they should be more accurate.
+    Some of the visuals may have been wrong before.  This may enable more
+    OpenGL programs to behave correctly.
+    
+    I also suspect libGL needs a little work to handle some of these correctly.
+    (cherry picked from commit 98a084ce9c455260ecdb5f8eecb67f33dbb53b69)
+
+commit c264826da96ad1859dd112b17eb8aa9e5278478f
 Author: Peter Hutterer <peter.hutterer@redhat.com>
 Date:   Thu Oct 16 11:22:29 2008 +1030
 
@@ -59,9 +5441,460 @@ Date:   Thu Oct 16 11:22:29 2008 +1030
     AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-    (cherry picked from commit c264826da96ad1859dd112b17eb8aa9e5278478f)
 
-commit 58e6d6afe04189f3c88b9e1998247ff797607ccb
+commit 6c451859552e1fc78f6589617482f9ff96d7ed8a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Oct 20 12:19:55 2008 +1030
+
+    config: don't add duplicate devices through HAL.
+    
+    If HAL is restarted, the device list is sent to the server again, leading
+    first to duplicate devices (and thus duplicate events), and later to a
+    FatalError "Too many input devices."
+    
+    dev->config_info contains the UDI for the device. If the UDI of a new devices
+    is equal to one we already have in the device list, just ignore it.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 102c4dac7c521941f52652152b1660cd7f559d56
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 13:17:31 2008 +0100
+
+    x86emu: fix sparse warnings
+    
+    ops2.c:113:18: warning: Using plain integer as NULL pointer
+    ops2.c:207:18: warning: Using plain integer as NULL pointer
+
+commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 13:13:21 2008 +0100
+
+    xfree86: fix compiler warnings in DoModalias()
+    
+    The precedence of == is higher than that of &, so that code was
+    probably buggy.
+    
+    xf86Init.c: In function 'DoModalias':
+    xf86Init.c:300: warning: suggest parentheses around comparison in operand of &
+    xf86Init.c:304: warning: suggest parentheses around comparison in operand of &
+    xf86Init.c:308: warning: suggest parentheses around comparison in operand of &
+
+commit 66fd05acd6118102aaaebc230d5c03e0758c6089
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 13:11:41 2008 +0100
+
+    xfree86: Silence compiler warnings about function prototypes
+    
+    xf86Init.c:136: warning: function declaration isn't a prototype
+    xf86Init.c:243: warning: function declaration isn't a prototype
+    xf86Init.c:249: warning: function declaration isn't a prototype
+
+commit 4b96ba8ddf36f84d4b8c0f2964535bd90477a742
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:56:35 2008 +0100
+
+    Nuke unused miBankNewSerialNumber
+
+commit e85d5d707d51d6a1558dfcf0ebd50183b84be39d
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:55:50 2008 +0100
+
+    Ansify declaration of FontToXError()
+
+commit 30a7a06a9e91a91b8517f67897831c1407713e57
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:38:44 2008 +0100
+
+    Nuke prototype for nonexistent function
+    
+    miDoInitVisuals was removed in commit
+    94825ad3c72a1c3f6a61199c302841f63241cf87, but its prototype was left.
+
+commit 5244690a5e0285b6243ee1f28ae6c8287a32b73d
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:37:11 2008 +0100
+
+    Add prototypes for strlcpy/strlcat
+
+commit eadf90aa65d1ea63ddcd74e60e66a79ad567c7e8
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:20:33 2008 +0100
+
+    xaa: Fix compiler warning (implicit declaration)
+    
+    xaaInit.c: In function 'XAAInit':
+    xaaInit.c:201: warning: implicit declaration of function 'miInitializeCompositeWrapper'
+    xaaInit.c:201: warning: nested extern declaration of 'miInitializeCompositeWrapper'
+
+commit aee514cfb5e5a59b7770699765ccdad8fe42f904
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:16:05 2008 +0100
+
+    xfree86: Fix compiler warnings (implicit declarations)
+    
+    Add missing includes to fix the following warnings:
+    xf86DGA.c: In function 'DGAProcessKeyboardEvent':
+    xf86DGA.c:1050: warning: implicit declaration of function 'UpdateDeviceState'
+    xf86DGA.c:1050: warning: nested extern declaration of 'UpdateDeviceState'
+    xf86Xinput.c: In function 'xf86ActivateDevice':
+    xf86Xinput.c:303: warning: implicit declaration of function 'AssignTypeAndName'
+    xf86Xinput.c:303: warning: nested extern declaration of 'AssignTypeAndName'
+    xf86Xinput.c:311: warning: implicit declaration of function 'DeviceIsPointerType'
+    xf86Xinput.c:311: warning: nested extern declaration of 'DeviceIsPointerType'
+    xf86Xinput.c:324: warning: implicit declaration of function 'XkbSetExtension'
+    xf86Xinput.c:324: warning: nested extern declaration of 'XkbSetExtension'
+
+commit add946daed531e29935593fb2e7ee70286185baf
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:14:40 2008 +0100
+
+    Nuke unused variables
+
+commit f2bda61c03f64133ef68dd1557b26ae7dc5beb0e
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 26 11:05:13 2008 +0100
+
+    Xext: Fix compiler warnings
+    
+    Make GEClientGone static and include registry.h, to fix the following
+    warnings:
+    geext.c:225: warning: no previous prototype for 'GEClientGone'
+    geext.c: In function 'GEExtensionInit':
+    geext.c:280: warning: implicit declaration of function 'RegisterResourceName'
+    geext.c:280: warning: nested extern declaration of 'RegisterResourceName'
+
+commit 24e863b0eb6ff11010a14cfd252a39df87a09d0e
+Author: Bernhard R. Link <brlink@debian.org>
+Date:   Sun Oct 26 00:19:34 2008 +0200
+
+    Bug#16501: autodetection of sbus graphic cards
+    
+    Add automatic detection of the graphic driver to load for sbus devices.
+    This allows xorg to work on those devices without a "Device" section.
+    
+    Debian bug#483942.
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit fd97ff1bdd30c358525068a4c833f681e00719a2
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sat Oct 25 22:54:15 2008 +0200
+
+    Bug#5851: Document the "Log" option in xorg.conf(5)
+
+commit 80b6768536fa439bfc5ce948bc8845a6f4af857b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 23 17:32:32 2008 -0700
+
+    XQuartz: Do check_xinitrc() later to avoid possible deadlock.
+    (cherry picked from commit af95174a088dc787d124ec548b1005f5b67c9e8d)
+
+commit d837d4e2af35a83c7932e4d0422097ebd1f6ba2c
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Oct 23 17:56:46 2008 -0600
+
+    XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building.  Fix the build.
+    (cherry picked from commit 6bcbb9ba85d95d7df63811a482abc39c4d595366)
+
+commit 6a2693b2f9cfdec6f30e2ca4c4176f986f97249e
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Oct 23 17:40:23 2008 -0600
+
+    XQuartz: Remove the enable_stereo default.  We now use feature detection to enable stereo visuals.
+    
+    We need to revisit the GL/indirect.c changes.  I think indirect.c should
+    be using the same feature detection and GLX visual config code.  The
+    indirect changes will require testing...
+    (cherry picked from commit 49b7a7c6f20ca85d4d624444eb83db2f91344591)
+
+commit b015a021b28623b7b734833dc9b8269c41db4e8a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Oct 21 20:30:35 2008 -0700
+
+    Allow non-gcc compilers to build xf86Xinput.c
+
+commit b7cc6ca22a4ff7a94abee6962a07fdd0b563d26a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 23 16:33:11 2008 -0700
+
+    miext/rootless: Silence some warnings by using proper C prototypes.
+    (cherry picked from commit 050e46e09efcc7e6f090fa4a749e9076c972b760)
+
+commit b397cc727787a854417b11b482cce4807fc8ab58
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Oct 23 16:19:58 2008 -0600
+
+    miext/rootless: Fix the usage of DeleteProperty so that this builds again.
+    (cherry picked from commit 3de250e28a9a86bcae4464a15c2025805877ce1e)
+
+commit 28d4f71193d2be26d1dcae724067539ac9db1123
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 23 15:01:03 2008 -0700
+
+    XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
+    (cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
+
+commit 40f9b6bf0dc62098680235a958e0733770902cca
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 23 17:33:52 2008 -0400
+
+    Argh, macros.
+
+commit 8b3c278fe7502f9343355f09213837622b0d9ca0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 23 11:39:04 2008 -0700
+
+    Rootless: Properly typed expose_1
+    (cherry picked from commit 78e874fe17174ac8f61586573edaf7f16ece7b21)
+
+commit 3e999d35c26b0ffb894c257a3057d44b949744bd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 23 11:37:13 2008 -0700
+
+    XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"
+    (cherry picked from commit bf561a06b2bf60395d26026ac7627d0cb254bc07)
+
+commit 75067d12e4f4daa080dfb0209a9abf9c5654271f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 21 19:36:48 2008 -0700
+
+    XQuartz: Added missing semicolons to Localizable.strings
+    (cherry picked from commit e9fe3f36d9529f00daeefa1379cdd6f01a88f410)
+
+commit a003932dccc438c4500d383982cee2376e808bd5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 21 11:23:42 2008 -0700
+
+    XQuartz: Default dpi to 96 instead of 75
+    (cherry picked from commit 08a5a333d7fea68146cd9cf50682b811378ab3ce)
+
+commit 2d764e21f278ea26bae135db6dae07b94651951c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 21 11:19:06 2008 -0700
+
+    XQuartz: pbproxy: SIGHUP reloads preferences.
+    (cherry picked from commit cbc0935ef74ebd76ed3db16d6ab86043eeed42a3)
+
+commit 0b695262176e96f508921905ee7f9cc086c7daf0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 23 15:01:58 2008 -0400
+
+    Change some #define foo() -> static void foo()
+
+commit aab73d719a8de6b830e47c7f47860b7990ea8d03
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 23 13:20:59 2008 -0400
+
+    Fix previous cherry pick for API changes
+
+commit 8767fc8d47276c7489ae50dd556a446a462776ea
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Apr 4 12:11:14 2008 -0700
+
+    Wrap AddTraps in exa and damage.
+    
+    This fine (and unused) function wasn't ever wrapped which made it not work
+    under exa.
+    
+    (cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
+
+commit 4c926dbac65ceb699b91bb0d3fd0005a5854572d
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 23 22:07:37 2008 +1030
+
+    dix: fix two more endian issues, correct initial "enabled" value. #18111
+    
+    EnableDevice and DisableDevice both change the property too.
+    
+    And enabled must be set to FALSE in AddInputDevice, the device is not enabled
+    yet.
+    
+    X.Org Bug 18111 <https://bugs.freedesktop.org/show_bug.cgi?id=18111>
+
+commit 084ae9e38812f19751a086eea7ce555761ae5a17
+Author: Jerome Glisse <glisse@freedesktop.org>
+Date:   Thu Oct 23 11:28:53 2008 +0200
+
+    dri2: fail at context creation if driver fail to create it's context
+
+commit ff60e592f003d8bc45789a1a14e86be22f5242b2
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 23 09:19:41 2008 +1030
+
+    dix: don't allow VCP/VCK be disabled through properties.
+
+commit 98f01c2abe4771d76febf8fe70111b2bddfab776
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 23 09:13:41 2008 +1030
+
+    dix: fix endianess issue in AddInputDevice. #18111
+    
+    dev->enabled is a Bool. Bool is two bytes.
+    BOOL on the other hand is a protocol type and always 1 byte. So copy the value
+    into the one-byte type before passing it into XIChangeDeviceProperty.
+    
+    Found by Michel Dänzer.
+    
+    X.Org Bug 18111 <http://bugs.freedesktop.org/show_bug.cgi?id=18111>
+
+commit f6cbe0326c57e3c9897f17baef78199b06537c44
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Oct 22 18:16:12 2008 +1030
+
+    dix: init remaining three xkb fields to zero in a new client.
+
+commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Oct 20 17:06:40 2008 +1030
+
+    xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.
+    
+    Also set AutoAddDevices and AutoEnableDevices to their defaults.
+    
+    And in doing so, switch the rest of the defaults over to named intializers.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit d72cd753b99fae147ef4c189700fc697f1ea7fb0
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Tue Oct 21 22:32:57 2008 +0200
+
+    Close well known connections in ServerAbort()
+
+commit 81e197b2a5457bb9f7ed72f82c2d33fd8dbfc202
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 21 16:00:32 2008 -0400
+
+    Bug #18159: Spell "anisotropic" correctly
+
+commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 21 13:10:44 2008 -0400
+
+    exa: Add exaDrawableIsOffscreen() to the driver API.
+
+commit c837d182c4674c01296bb7efd7d834d9dfd55f83
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 21 09:11:59 2008 -0700
+
+    XQuartz: Only send mouse events while in the background if we're over a visible window.
+    
+    This "breaks" xeyes but gets rid of annoying tooltips.
+    (cherry picked from commit 10090a132a0110fe24c8c886d9f53e6e947f8038)
+
+commit 2a9613980f93959eedf9396735785d4c50546e2d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 21 09:07:08 2008 -0700
+
+    XQuartz: More fullscreen fixes
+      Start in rooted mode when enabled
+      Make the hotkey cmd-alt-a behave
+    (cherry picked from commit 22a54e46176c9cbdfaaa59ef33a6ae6a9c4969ef)
+
+commit e4ea1494debda4d3da03864c2640921fe0430694
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Oct 20 12:23:04 2008 -0700
+
+    XQuartz: Cleaned up keyboard init and map reload.
+    (cherry picked from commit f78c9fc06cac2cc6ddfd6e9ba435dd26a57d1f51)
+
+commit ebb2e1449cfb382a806e04c52d42240670717069
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Oct 20 09:46:34 2008 -0700
+
+    XQuartz: Fixed follow-keyboard-layout
+    ≈
+    (cherry picked from commit a9f9fbf512c9fd5a773fce402182486edc71d5ab)
+
+commit f67cd31d2cf1b8ad850bd21dbed5a975d77b4c54
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 21 09:29:37 2008 -0700
+
+    XQuartz: More progress towards fullscreen...
+    (cherry picked from commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649)
+    (cherry picked from commit b47b7ab6d6d0a7f6cbf678a5755124d6b7516d3e)
+
+commit d434ed400986653771bbd60c224a2275bd6147ef
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 17 09:25:26 2008 -0700
+
+    XQuartz: Fixed missing key-equiv for Hide-Others.
+    (cherry picked from commit 2c4b0f9615b646712609ebef3c0851c9a22e781b)
+
+commit 3695f62d072e7864fdcee385c8b5ca40f2018101
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 16 22:36:00 2008 -0700
+
+    XQuartz: Require applewmproto-1.1.1
+    (cherry picked from commit ed235e3406e603a8a92c4b72f9f9018bae72ad65)
+
+commit f935c11398b93860461672e88814026d75b71689
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Oct 16 13:09:21 2008 -0600
+
+    XQuartz: pbproxy: Fix 2 bugs with the preferences.
+    
+    Add dump_prefs() for instrospection.
+    
+    Make prefs_get_bool a little more clear.
+    
+    In get_property don't assume that the Mac realloc(NULL, 0); returns
+    non-NULL.  We shouldn't depend on implementation-defined behavior too
+    much.
+    
+    Add more commentary in various spots.
+    
+    Add TARGETS in the TARGETS response.  I don't know why some X11 apps
+    do this, but it could be something that some weird toolkit/app tests
+    for.
+    
+    In reload_preferences add preferences synchronization, so that xpbproxy
+    reloads the preferences, and picks up any changes.
+    
+    Fix a typo/misspelling of the sync_clipboard_to_pasteboard preference.
+    (cherry picked from commit 165cbbb90c793d9335ea76f0274b1f60ad295903)
+
+commit 4d978af5c71430f0043b1272f8dc6344b8f03f12
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 15 21:26:58 2008 -0700
+
+    XQuartz: Fixed window levels.
+    (cherry picked from commit ef4d37c73f31048dd74efee2c63fa08b92608f87)
+
+commit 58eacf0b7beb8c6f1971570ede0bfd3976a84665
+Author: Rémi Cardona <remi@gentoo.org>
+Date:   Tue Oct 21 10:07:24 2008 -0400
+
+    Force LC_ALL=C when building xf86DefModeSet.c
+    
+    Fixes build in not-quite-latin locales.
+
+commit 2188582e5ea90edb432a2f421d0a267439ba08f9
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Oct 20 09:55:24 2008 -0400
+
+    EXA: Avoid excessive syncing in PutImage
+
+commit 8d0cb507ae568c8da92f10ff1188d797bcaa3d1a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 17 09:59:29 2008 +1030
+
+    dmx: avoid hilarious #define Xcalloc xcalloc game.
+
+commit 8a23707b866c11807e01056db97afec56e9b19c8
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Oct 17 09:15:39 2008 +1030
+
+    dmx: change remainder of manual EQ allocation to GetEventList().
+
+commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f
+Author: Pierre Willenbrock <pierre@pirsoft.de>
+Date:   Thu Oct 16 14:28:14 2008 -0400
+
+    RANDR: Fix output property event delivery.
+
+commit d936a4235c9625bd41569cef3452dd086284e0d7
 Author: Peter Hutterer <peter.hutterer@redhat.com>
 Date:   Sun Oct 12 21:58:30 2008 +1030
 
@@ -97,111 +5930,159 @@ Date:   Sun Oct 12 21:58:30 2008 +1030
     
     Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
     Signed-off-by: Adam Jackson <ajax@redhat.com>
-    (cherry picked from commit d936a4235c9625bd41569cef3452dd086284e0d7)
 
-commit bc199fdf79a72275592d325dc034adccc6dd93af
-Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date:   Mon Oct 20 12:19:55 2008 +1030
+commit 84ef8ed6fbefd8d6c0aaa3c862879f9804299bd8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 15 14:11:18 2008 -0700
 
-    config: don't add duplicate devices through HAL.
-    
-    If HAL is restarted, the device list is sent to the server again, leading
-    first to duplicate devices (and thus duplicate events), and later to a
-    FatalError "Too many input devices."
-    
-    dev->config_info contains the UDI for the device. If the UDI of a new devices
-    is equal to one we already have in the device list, just ignore it.
+    XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
+    (cherry picked from commit bcb83eea729a01026d99d1cfc2b77385b5b275fd)
+
+commit 0195d318465d5a6a9039091bcb252202471df5a4
+Author: Luc Verhaegen <libv@skynet.be>
+Date:   Wed Oct 15 21:46:27 2008 +0200
+
+    GLX: fix build when dri2 _is_ available.
     
-    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-    (cherry picked from commit 6c451859552e1fc78f6589617482f9ff96d7ed8a)
+    Caught by Julien Cristau.
 
-commit e63ef549bb7a2591d99987c85f414c08dbbf9a6b
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Oct 21 22:32:57 2008 +0200
+commit 398cdf959afadfa964aece13cc9d89b2dd589930
+Author: Luc Verhaegen <libv@skynet.be>
+Date:   Wed Oct 15 18:24:10 2008 +0200
 
-    Close well known connections in ServerAbort()
-    (cherry picked from commit d72cd753b99fae147ef4c189700fc697f1ea7fb0)
+    GLX: fix build when dri2 is not available.
 
-commit 5d14e345411dfe4b4fd334e4e54fbf24dcfa65bd
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Oct 21 13:10:44 2008 -0400
+commit 2e60ebbd254290e19492b97c960d9678513c94bf
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 15 14:10:51 2008 +0100
 
-    exa: Add exaDrawableIsOffscreen() to the driver API.
+    XFree86: Simplify DontZap/-retro interaction
     
-    (cherry picked from commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003)
+    How hard could it possibly be, right?
 
-commit f4c33e2e64ce83c29c3bc79853e421247acfea11
-Author: Michel Dänzer <michel@tungstengraphics.com>
-Date:   Mon Oct 20 09:55:24 2008 -0400
+commit 66a87517bd80b21e107df9d57968d81a92f91fd5
+Author: Alan Hourihane <alanh@tungstengraphics.com>
+Date:   Wed Oct 15 12:00:16 2008 +0100
 
-    EXA: Avoid excessive syncing in PutImage
-    (cherry picked from commit 2188582e5ea90edb432a2f421d0a267439ba08f9)
+    re-enable DRI2
 
-commit df22857b34edb9f29ace3800ba99f14c7be8058e
-Author: Pierre Willenbrock <pierre@pirsoft.de>
-Date:   Thu Oct 16 14:28:14 2008 -0400
+commit ced6690284fd334f225bbc94685c114ad3ab96d8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Tue Oct 7 13:49:28 2008 -0400
 
-    RANDR: Fix output property event delivery.
-    (cherry picked from commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f)
+    dri2: Update to latest protocol draft.
+    
+    Mainly rename SwapBuffers to CopyRegion, which adds the xfixes region
+    argument and the bitmask argument to let us extend it in the future.
 
-commit 42429aa3269d68bc7909616ce8b0d0b5ca5624d2
-Author: Keith Packard <keithp@keithp.com>
-Date:   Mon Oct 6 12:21:20 2008 -0400
+commit 87a016ae00feac3fbaa7e7a518076a3852d49554
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Wed Oct 15 00:02:13 2008 +0200
 
-    RANDR: Delivery output property events.
-    (cherry picked from commit 9187f6ad9ec7ba9569a93d92561aac17eaa83491)
+    exa: restore {x,y}{Src,Dst} to their original values when !done
 
-commit b28c25b5aeecea22aba997e2b0d24e77a22b6e02
-Author: Rémi Cardona <remi@gentoo.org>
-Date:   Tue Oct 21 10:07:24 2008 -0400
+commit b677bff97b62c3931df853bae25ab485892ae173
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 14 14:30:19 2008 -0400
 
-    Force LC_ALL=C when building xf86DefModeSet.c
+    int10: Degrade the checksum warning to X_INFO.
     
-    Fixes build in not-quite-latin locales.
+    I've seen about one case in three years where this has actually been
+    correlated with the real cause of failure, and we've trained people to
+    freak out about X_WARNING, so let's be less alarmist.
 
-commit 992a7168f0db5733fe4a6cbd2f40c6b1f2a150e0
-Author: Martin von Gagern <Martin.vGagern@gmx.net>
-Date:   Wed Nov 5 11:44:03 2008 -0500
+commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 14 14:04:01 2008 -0400
 
-    Bug #17858: Fix Xvesa build on newer kernels.
+    EDID: Catch even more cases of encoding aspect as size.
     
-    Not cherry picked from master, Xvesa is gone there.
+    Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
+    global size record, you also claim to be 160mm by 90mm in the detailed
+    timings.  Grrr.
 
-commit ec5046ca7565e2364f42606b26159520a73dd207
-Author: Maarten Maathuis <madman2003@gmail.com>
-Date:   Fri Oct 10 23:23:02 2008 +0200
+commit ad677238bc96a8578113bbe76d605d7a87aca44c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 14 13:00:50 2008 -0400
 
-    dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
-    
-    - This breaks on the 2nd server generation.
-    - No other subsystem seems to NULL their key.
-    - This should fix bug 17982.
-    (cherry picked from commit 5b336585a4cdf11d20831a9536ad581e959ea7f1)
+    Add backtrace definitions to dix-config.h.in
 
-commit f75163e5f6fc6dd63ac4eb97e403086031230250
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Oct 21 16:00:32 2008 -0400
+commit 8e368cf5b964f1d29fda0a463f9510457619b14d
+Author: Nathaniel McCallum <nathaniel@natemccallum.com>
+Date:   Tue Oct 14 09:50:29 2008 -0400
 
-    Bug #18159: Spell "anisotropic" correctly
-    (cherry picked from commit 81e197b2a5457bb9f7ed72f82c2d33fd8dbfc202)
+    Xorg: add -modalias option
+    
+    This scans the installed video drivers and prints a Linux-style modalias
+    listing of the devices each driver claims to support.
 
-commit b468eacf511de3c3f8b6a1abd9e38680947b464e
+commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Oct 14 09:45:19 2008 -0400
 
     kdrive: Hardcode a different wrong value for number of mouse buttons
     
     This should really come from the input driver directly, but, kdrive.
-    (cherry picked from commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b)
 
-commit 19776ede8f10e0f59dbc50d93e51facbc4071877
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Oct 14 13:00:50 2008 -0400
+commit f3f6ea89aa9e0ffe9e37bc059e5e6bf75be4ee9f
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Oct 8 14:12:21 2008 +1030
 
-    Add backtrace definitions to dix-config.h.in
-    (cherry picked from commit ad677238bc96a8578113bbe76d605d7a87aca44c)
+    Xi: check all handlers before applying property changes.
+    
+    The current code exposes to inconsistent updates, i.e. if handler N succeeds
+    but handler N+1 fails in setting the property, an error is returned to the
+    client although parts of the server now behave as if the property change
+    succeeded.
+    
+    This patch adds a "checkonly" parameter to the SetProperty handler. The
+    handlers are then called twice, once with checkonly set to TRUE.
+    On the checkonly run, handlers _MUST_ return error codes if the property
+    cannot be applied. Handlers are not permitted to actually apply the changes.
+    On the second run, handlers are permitted to apply property changes.
+    Errors codes returned on the second run are ignored.
+
+commit ad67e3f063aa79247270f29e989bbfe5f62c9ed7
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Sun Oct 12 10:19:36 2008 +1030
+
+    dix: remove duplicate code in ReleaseActiveGrabs
+    
+    Spotted by Colin Harrison.
+
+commit 3fc4f40b6c6cb416c9dc4bdb35c91b4f32c03ccc
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Sun Oct 12 16:08:26 2008 -0700
+
+    Restore xf86{Enable, Disable}GeneralHandler.
+    
+    These were useful as part of the generic handler ABI, and are used by the NVIDIA
+    driver.
+    
+    This reverts part of commit 50081d2dfb79878cb931a15c265f0d60698dfd39.
+
+commit 2217d22a76cdb2460f9683a6bf74c7248612889d
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Sun Oct 12 16:07:24 2008 -0700
 
-commit 483fb847b4363d09ff3347f61ad51bba1dd00602
+    Revert "xfree86: xf86{Enable, Disable}InputHandler can be static."
+    
+    These were potentially useful as part of the input handler ABI, even if nobody
+    currently uses them.
+    
+    This reverts commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca.
+
+commit 5b336585a4cdf11d20831a9536ad581e959ea7f1
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Oct 10 23:23:02 2008 +0200
+
+    dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
+    
+    - This breaks on the 2nd server generation.
+    - No other subsystem seems to NULL their key.
+    - This should fix bug 17982.
+
+commit b736f477f5324f79af30fc0f941ba0714a34ccda
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Oct 10 16:33:24 2008 -0400
 
@@ -210,33 +6091,24 @@ Date:   Fri Oct 10 16:33:24 2008 -0400
     Since we're probably stuck down in a driver somewhere, let's at least
     try to point out where.  This will need to be rethought when the input
     thread work lands though.
-    (cherry picked from commit b736f477f5324f79af30fc0f941ba0714a34ccda)
 
-commit 7df5e93cf52aad35509be9e6d8c25e399fba0c60
+commit 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Oct 10 15:53:48 2008 -0400
 
     Move xorg_backtrace() up to the OS level so we can call it from DIX.
-    (cherry picked from commit 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd)
 
-commit aa548b0a9b4999f21630273261a8f5880dd24a7f
+commit f650c1aeb06e957626bb0a74eddbb133f59dbecb
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Oct 14 14:04:01 2008 -0400
+Date:   Fri Oct 10 14:07:28 2008 -0400
 
-    EDID: Catch even more cases of encoding aspect as size.
+    Revert "Don't leak EDID_block"
     
-    Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
-    global size record, you also claim to be 160mm by 90mm in the detailed
-    timings.  Grrr.
-    (cherry picked from commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a)
-
-commit 6dcfa994b0777bf0cabeb71672f13e650b340817
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Fri Oct 10 15:26:32 2008 -0400
-
-    xserver 1.5.2
+    This reverts commit 05cdef18ca668ffc86b71033f71cfbd262cdd994.
+    
+    http://lists.freedesktop.org/archives/xorg/2008-October/039305.html
 
-commit 75504517a30f1bdd593c2a32af81084b59b398a5
+commit 0660dd9d7009147c395b9ea904539f76f55b9a7f
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Oct 10 13:41:50 2008 -0400
 
@@ -244,25 +6116,180 @@ Date:   Fri Oct 10 13:41:50 2008 -0400
     
     This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
     thing like legality stop anyone.
-    (cherry picked from commit 0660dd9d7009147c395b9ea904539f76f55b9a7f)
 
-commit b595b65e54b1e15fbce872fe3719da14cfae5b92
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Thu Oct 9 14:53:29 2008 -0400
+commit 956a4ba40b28251ab2d88b5d5b0796e01afd2bdd
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Oct 10 00:28:34 2008 +0200
 
-    Revert "Array-index based devPrivates implementation."
+    pixmap: Add some notes to devKind and devPrivate.
+
+commit 4808bdec45775342eb9a6352b41e4919e1a69279
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 9 16:23:24 2008 +1030
+
+    Xi: don't memcpy the KeyClassRec from SD to MD. #16167
+    
+    Most of its component get copied during CopyKeyClass anyway.
+    The ones that aren't:
+      postdown - never changed for virtual devices anyway.
+      down - shouldn't change that without sending events.
     
-    This reverts commit 8ef37c194fa08d3911095299413a42a01162b078.
+    memcpy'ing the struct also copied mapWidth, which means we didn't realloc
+    during SetKeySymsMap lateron, overwriting the memory assigned to us.
+    
+    X.Org Bug 16167 <http://bugs.freedesktop.org/show_bug.cgi?id=16167>
 
-commit ca659813a81074cae55ffec51f923c658480b618
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Wed Oct 8 19:46:50 2008 +0200
+commit 18cdd733ad3dd36fa0a23dfbf18c7d99b86c0276
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 9 17:26:00 2008 +1030
+
+    kdrive: fix dixflags so they're always defined before enqueuing events #17734
+    
+    If absolute events were posted, dixflags got set conditionally on whether the
+    valuators are different from the last posted set of values.
+    If dixflags are undefined however, the DIX interprets them as relative
+    valuators. Fix this by making sure defining dixflags is always defined.
+    
+    X.Org Bug 17724 <http://bugs.freedesktop.org/show_bug.cgi?id=17734>
+
+commit d58f2c30c64e8b2d8179dac06e0a54be06099da6
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 9 16:50:54 2008 +1030
 
-    Fix GKVE with key_code > 255
+    kdrive: lastx/y needs to be set to the event coordinates #17728
     
-    Move the keycode validation checks before use.
+    X.Org Bug 17728 <http://bugs.freedesktop.org/show_bug.cgi?id=17728>
 
-commit 8337c9aa3d2009eea801a84b3a65272e03e65e1a
+commit decec14219bcd992ec426e202ff3c8681b520b74
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 9 15:10:21 2008 +1030
+
+    dix: silence "unused variable" compiler warning.
+
+commit 0b4b683f3eeec43536e73be302a4c396fe4d9894
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Oct 7 18:44:42 2008 +1030
+
+    xfree86: export NewInputDeviceRequest/DeleteInputDeviceRequest
+    
+    NIDR should be used to create a new SD from e.g. within a driver.
+    DIDR should be used to remove a device from the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 5e213fe1022bf96747834a3ac227929b23136ee6
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 9 11:29:11 2008 +1030
+
+    xfree86: cache dev->isMaster before freeing the device.
+
+commit 05cdef18ca668ffc86b71033f71cfbd262cdd994
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date:   Fri Oct 10 13:45:51 2008 +0800
+
+    Don't leak EDID_block
+
+commit 2d9da7a5f384d5f38b2be79b1ea0df5a3deb52d1
+Author: Luc Verhaegen <libv@skynet.be>
+Date:   Thu Oct 9 22:22:53 2008 +0200
+
+    DGA: Track client state even when using old style DGA.
+    
+    This fixes the issue that a badly killed DGA will keep on hogging
+    mode/framebuffer/mouse/keyboard.
+
+commit 322335d5b5b6f155f56fe3c1cbe372f13dc20932
+Author: Luc Verhaegen <libv@skynet.be>
+Date:   Thu Oct 9 22:21:05 2008 +0200
+
+    DGA: Mash together xf86dga.c and xf86dga2.c.
+    
+    This in preparation for an upcoming client state tracking fix.
+
+commit d13c3cbd43bc5e6b459c7df822292cf02ad2c9c4
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 8 18:39:41 2008 -0700
+
+    XQuartz: Some motion made towards supporting fullscreen.
+    (cherry picked from commit 99be3d68b64059caada739a373e5e01844c776e0)
+
+commit dc166bf6423f4243ea05f17340ff9ff99ecad74b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 7 11:39:08 2008 -0700
+
+    XQuartz: Fixed EXTRA_DIST for new GL files.
+    (cherry picked from commit a11c9052030b44045f037050a5825256b539ed50)
+
+commit 803327929445256e159c10894e6305fbaa389982
+Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
+Date:   Tue Oct 7 12:12:38 2008 -0600
+
+    XQuartz: GL: setVisualConfigs() copied the behavior of indirect.c which is wrong, with regard to the handling of xcalloc failure.
+    
+    Use ErrorF for an error message after an xcalloc failure, and return instead of falling through to GlxSetVisualConfigs, or abort()ing at the test branch.
+    (cherry picked from commit 1056700971fd5c034396ed6dbea15e092f0c6332)
+
+commit f1fec6f323b27a0165325d8fcf6af7ae163bde14
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 8 18:45:04 2008 -0700
+
+    XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
+    (cherry picked from commit 97173d4eda142c73bb975cc05225b791778f85af)
+
+commit 52accec7dbc613a521e40449b8bb5f0c92ddb105
+Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
+Date:   Tue Oct 7 11:31:48 2008 -0600
+
+    XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
+    (cherry picked from commit 190a3d5e5de9915931928fb8e6da88bb9644cda4)
+
+commit 63abdf61151cc90f769ed1708ee19b6c434c27c9
+Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
+Date:   Mon Oct 6 18:05:12 2008 -0600
+
+    XQuartz: GL: Add the new C code to the Makefile.am.
+    
+    Commit the darwin.c changes I missed in the last commit, for calling
+    setVisualConfigs().
+    (cherry picked from commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d)
+
+commit a8f5d422c9c0a39f55e80bbd180439b6ec3a805c
+Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
+Date:   Mon Oct 6 18:01:23 2008 -0600
+
+    XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
+    
+    Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
+    (cherry picked from commit fc86f9e4482043eca76d9d7a96e166be1aabf674)
+
+commit 2998e48be343ab2a11d6d328fc961ab5b8eb9292
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Oct 4 21:25:50 2008 -0700
+
+    Xquartz: Fix parallel builds
+    (cherry picked from commit 1fe7298a3b9a2ed82c612292f9e547cf78f99ae5)
+
+commit 7aa535708f1f33173bf05abc17b75e0841ffc385
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 16:25:59 2008 -0400
+
+    Fix more xcalloc stupidity.
+    
+    Did I mention the hate?  Pretty sure I mentioned the hate.
+
+commit 4fe80aa14a24df6d0611c47fc5654c3c4f56fdb1
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 16:22:35 2008 -0400
+
+    I hate you xlib.  Please die in a fire.
+
+commit 2c5332872f808e7a646a63ae7ec63a2b80f83ee7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Oct 8 13:39:49 2008 -0400
+
+    s/kdDontZap/kdAllowZap/
+
+commit 1feb69eb63e6739ff5db255ad529e84adf941a10
 Author: Luc Verhaegen <libv@skynet.be>
 Date:   Wed Oct 8 14:55:29 2008 +0200
 
@@ -270,9 +6297,37 @@ Date:   Wed Oct 8 14:55:29 2008 +0200
     
     Fixes a segfault when trying to activate a DGA mode without checking
     whether DGA modesetting is at all possible.
-    (cherry picked from commit 1feb69eb63e6739ff5db255ad529e84adf941a10)
 
-commit 4e6cbd323854709ae00c44108c93ab6596151de2
+commit d1bb5e3b47ab71aa2f18f69daaf2a4c5ce06d800
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 03:19:45 2008 -0300
+
+    mi: functions here are carrying 'time' without need.
+
+commit 4964a9ca6c3f26376469b6d8217815a47231f0a9
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 03:06:32 2008 -0300
+
+    mi: remove deprecated and unused functions.
+    
+    miPointerDeltaCursor, miPointerGetMotionBufferSize and
+    miPointerSetNewScreen.
+
+commit adf3e296e2b00164fb22e89ad4f44acbd2e3deae
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 02:12:49 2008 -0300
+
+    Remove unused declarations.
+    
+    AvailableClientInput (LBX debris) and xf86XinputFinalizeInit.
+
+commit bca9fa2efe97d2816a2e9412cdff08a0145c8f96
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 01:38:27 2008 -0300
+
+    Everyone knows that the loader is present. Silence it.
+
+commit 56c615368c5a8e7acb0398434c2c68578626aa38
 Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
 Date:   Wed Oct 8 13:33:55 2008 +0800
 
@@ -280,16 +6335,98 @@ Date:   Wed Oct 8 13:33:55 2008 +0800
     
     In case no enabled outputs, we will reference wrong index of
     output array.
-    (cherry picked from commit 56c615368c5a8e7acb0398434c2c68578626aa38)
 
-commit 43e3af9cac2e9fd613a61a870bfe00f4782a368d
+commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 01:18:49 2008 -0300
+
+    xfree86: xf86{Enable, Disable}InputHandler can be static.
+
+commit 50081d2dfb79878cb931a15c265f0d60698dfd39
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 01:11:38 2008 -0300
+
+    xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused.
+
+commit 54294e15ecf4a8ec0fd9fa8b6ed1a1b2d912ec7e
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Oct 8 00:43:22 2008 -0300
+
+    xfree86: fix wrong function name message errors.
+
+commit 57dbb90f198116dcaf17c8111a7f80644d7ebe7f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 7 20:36:45 2008 -0400
+
+    Document zap/-retro interaction more.
+
+commit 617933e8c259ad12388c0dd13421846a873975e3
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 8 02:45:59 2008 +0300
+
+    XFree86: Fix DontZap interaction with -retro
+    
+    -retro will now _not_ override (No)DontZap, if it's set in the config
+    file.
+
+commit d80bae2237e555025465d4d761a5cc537cc2bcdd
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 8 02:43:27 2008 +0300
+
+    Update docs to reflect new DontZap default
+
+commit 42e7b64bf90604e0099702f5447163be80a2efb6
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 7 20:32:02 2008 -0400
+
+    -retro enables zapping
+
+commit 9d135ac10a7374c7ccda705f1eeb02cc53076c34
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 8 02:30:05 2008 +0300
+
+    Input: Make DontZap the default
+    
+    If you need to bail out the server, use Ctrl-Alt-Fx, or enable zapping
+    if it bothers you that much.  If Ctrl-Alt-Fx is broken, nag me until
+    it's permanently fixed.
+
+commit b574365fca954a999ebaeb7203d1e0ea6d99b3ea
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Oct 7 13:09:11 2008 -0700
+
+    Revert "Unexport (and unimplement) xf86SetAccessFuncs" for now.
+    
+    The nvidia driver currently uses these hooks to work around problems where RAC
+    will disable access to the hardware at unexpected times.  This change restores
+    these hooks until we can come up with a better API for working around RAC.
+    
+    This reverts commit c1df4fbede8058c15ce3a5759a7758fecafbb9e7.
+
+commit fe85ec34ec2b58188633dac4464a1e9e9977652b
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Oct 7 13:08:38 2008 -0700
+
+    Revert "Remove unused server state change callbackery" for now.
+    
+    The nvidia driver currently uses these callbacks to work around problems where
+    RAC will disable access to the hardware at unexpected times.  This change
+    restores these hooks until we can come up with a better API for working around
+    RAC.
+    
+    This reverts commit d7c0ba2e9eae7044ef4c31d9c3cbb9a71ee0f9f9.
+    
+    Conflicts:
+    
+    	hw/xfree86/loader/xf86sym.c
+
+commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Oct 7 13:41:25 2008 -0400
 
     int10: Fix a nasty memory leak.
-    (cherry picked from commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6)
 
-commit 00ac80a0c408106158bf258b6da8350611fbfe84
+commit a57b2f172c1291f22f7ba2780c1b2f55e353c3e9
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Oct 7 13:39:10 2008 -0400
 
@@ -298,9 +6435,8 @@ Date:   Tue Oct 7 13:39:10 2008 -0400
     Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking
     for the config space of every possible device number.  This despite
     perfectly functional BIOS methods to enumerate the bus exactly.
-    (cherry picked from commit a57b2f172c1291f22f7ba2780c1b2f55e353c3e9)
 
-commit c6ce2f6b3fe12e65b0e8a75cc1bc0a21875e14e3
+commit a65e36a873cd1ba9896cd0f9a3e94dd933666005
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Oct 7 13:38:12 2008 -0400
 
@@ -308,21 +6444,641 @@ Date:   Tue Oct 7 13:38:12 2008 -0400
     
     If you have more than one PCI device with the same d/b/d/f, you're
     already in trouble.
-    (cherry picked from commit a65e36a873cd1ba9896cd0f9a3e94dd933666005)
 
-commit 8ef37c194fa08d3911095299413a42a01162b078
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Fri Sep 12 19:11:53 2008 -0400
+commit 6dbfca571f6d214dc456710a60ebbbbd204cdbbd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 7 10:07:03 2008 -0700
 
-    Array-index based devPrivates implementation.
+    Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH
+
+commit 30193fbff9d9284fbbd81fe5f7b6c4d102daf1d1
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Oct 7 10:36:12 2008 -0400
+
+    Reinstate cursorScreenDevPriv
+
+commit e7cd5d84ed1fb3637dce6e9e6ef58c8611818c4e
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Oct 7 16:09:17 2008 +1000
+
+    fixup another calloc build issue
+
+commit 60cfaa45a532bd3cfcfb4bd57b2f657c0a8b6a6b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Oct 6 18:47:06 2008 -0400
+
+    Build fix.
+
+commit c6d6d3e87a472b641d883a6c000f96e5bdf48532
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Oct 6 16:18:21 2008 -0400
+
+    Loader: Unexport a handful of consumerless symbols from dixsym.
+
+commit 8a5b89e8e184f4cbf33c6dee0b06e61d8f857576
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Oct 6 15:36:51 2008 -0400
+
+    xalloc+memset(0) -> xcalloc
+
+commit 0b7b89fbac0b3865b2cf51295c68a5f4c7523f28
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Oct 6 14:19:30 2008 -0400
+
+    xalloc+bzero -> xcalloc
+
+commit 9187f6ad9ec7ba9569a93d92561aac17eaa83491
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Oct 6 12:21:20 2008 -0400
+
+    RANDR: Delivery output property events.
+
+commit 717c7492a0f6ba3fb3eabda33515881eef314155
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Tue Oct 7 02:38:44 2008 +1000
+
+    exa: don't call composite routines with no buffer.
     
-    Note: DevPrivateKey is now pointer-to-int, which means
-    each key now needs to point to some global storage of
-    size at least sizeof(int).
+    We can get a case with gnome-terminal + links, where we get two arrays
+    of glyphs all with 0 width and 0 heights in them. If this happens
+    we manage to get to this case without any buffer setup and segfault.
+
+commit aacac3edac7c6b82a0a0e3bc500f563d187e5df3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Oct 4 21:07:31 2008 -0700
+
+    XQuartz: Bumped bundle version to 2.3.2 for beta1
+    (cherry picked from commit 2021c4c4e726a6b8f27f19f16ed3d86e37dbe448)
+
+commit ed3134918dcbbd58a5ef8359a77e8024c98396e6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Oct 4 21:06:58 2008 -0700
+
+    XQuartz: pbcopy: Re-enabled some code I commented out for testing
+    (cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
+
+commit b3a971d8b5df5ab4af0be49105ef32f67d010901
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Oct 4 18:54:15 2008 -0700
+
+    XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
+    (cherry picked from commit f7673bb4de3c1f71eb390a3279eed3589efc3df4)
+
+commit fc35c7a2e2888cb767413f5e85a79c7f422a6284
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Oct 4 21:16:54 2008 -0700
+
+    XQuartz: GLX - enable_stereo defaults option should work now
+    (cherry picked from commit 3a6898f48756fdb2898292679301ef3dc109b4f6)
+
+commit 7818aba1d1e74f4ffe68b7d6806622b94ae8a230
+Author: Roland Scheidegger <sroland@tungstengraphics.com>
+Date:   Sat Oct 4 15:50:35 2008 +0200
+
+    dri2: fix compilation (remove no longer existing include file)
+
+commit a29af6465883796a6acf04b72ce812a0632b2186
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Oct 3 23:54:10 2008 +0200
+
+    exa: remove "direct" case for exa{Trapezoids,Triangles}
+    
+    - By adding a small hack to the xserver i was able to easily test the performance of the normally rare direct case (using cairo).
+    - It turned out to be 70% slower for me (large test on an otherwise idle computer), which seems enough of a reason to remove it.
+    - AddTraps could also use a 2nd look, but since noone is using that it's a bit hard and less useful to test.
+
+commit 416870d8c9e7e383b87c8513c2296a0cb66e7ef4
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Oct 3 22:59:40 2008 +0200
+
+    exa: remove some excessive whitespace
+
+commit b72a217ad59cc527327d7b1fc81898677b977d8f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 18:30:37 2008 -0400
+
+    Dangling use of miDestroyGCOps
+
+commit f5bbc54a93f53cd4ba124712159bb44c93282a8e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 18:18:02 2008 -0400
+
+    Fix compile for miSetScreenPixmap prototype.
+
+commit 9dbfcd89214241626ac2704d1ffffff1cc0c67ae
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 17:40:30 2008 -0400
+
+    Delete unused miModifyBanking()
+
+commit 94825ad3c72a1c3f6a61199c302841f63241cf87
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 17:39:34 2008 -0400
+
+    Remove unused wrapping for visual initialization.
+
+commit 4791f8e2ba9a0e318b7f13c83618ece036dd53ed
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 17:23:58 2008 -0400
+
+    staticize mi{G,S}etScreenPixmap
+
+commit 14d98b4a2fdea4a4f5cc9b751151672cb392fba3
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 17:21:16 2008 -0400
+
+    miFindMaxBand is dead code
+
+commit 48b47928133bc462947104bd0f4204f00b993862
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 17:16:28 2008 -0400
+
+    mi{Create,Destroy}GCOps are unused, nuke 'em.
+
+commit bd0e87c74789bd5447ec731aa2d2d6e05dd54abc
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 17:13:10 2008 -0400
+
+    Remove a bunch of unused API from the mi export list.
+
+commit ee5e07bc22f0c3af7a412b6bc430eae6a1dafe16
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 16:58:01 2008 -0400
+
+    loader: sort the mi symbol list
+
+commit 77d0b0ecfa3c67ff8d11e773a7f083721cf4c6d7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 16:53:08 2008 -0400
+
+    Remove unused pciNumBuses
+
+commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 16:05:19 2008 -0400
+
+    Remove the Must_have_memory hack.
+    
+    Also remove an astonishing amount of misunderstanding of how casts work.
+
+commit e6b1c1fada19268af559d89375989973729fdb19
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:47:50 2008 -0400
+
+    const cleanup
+
+commit fe616f9230b672edb89fca7516e750dc1b20c690
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:42:58 2008 -0400
+
+    Drop the never-called SkippedRequestCallback list.
+
+commit 31136b9467c2a17bbed4a51d6a6c41e3290bd236
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:33:47 2008 -0400
+
+    Unexport MakeClientGrab{Imp,P}ervious
+    
+    xtrap used to use these, but it's gone now.  xtest still does but it's
+    linked statically.
+
+commit eaf3fdf97014c27aececa8505c2713e7c9a537fc
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:24:35 2008 -0400
+
+    Unexport xf86NoSharedResources
+
+commit d7d9edb506bfea1c10516b6c4eb72dee3559863c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:17:44 2008 -0400
+
+    Unexport xf86DeallocateResourcesForEntity
+
+commit 49673b43584928c22d699d1968ed6813b272aefe
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:13:39 2008 -0400
+
+    Unexport xf86SetEntityFuncs
+
+commit 949ef6b79a36d6f6bbc192c20ef0f13cc95d4f28
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:10:26 2008 -0400
+
+    Unexport xf86ChkConflict
+    
+    Also remove the unused internal ChkConflict()
+
+commit d7c0ba2e9eae7044ef4c31d9c3cbb9a71ee0f9f9
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 15:06:42 2008 -0400
+
+    Remove unused server state change callbackery.
+
+commit 9ada146a16bcf220b2dd2936fb3a0349a31e99d3
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 14:40:18 2008 -0400
+
+    xf86RegisterResources: Always print any failed registrations.
+
+commit a5d3fa90f3de763a5dcbb0ff4987562449819323
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 14:38:48 2008 -0400
+
+    Typo fix.
+
+commit cc3335858508ffbc52123eb5bb0c34f42800c8c4
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 14:37:59 2008 -0400
+
+    Remove the old implementation of RemoveOverlaps
+
+commit 8fbf1185f5d6a1836b3e4265de6f605d82478e0b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 14:32:32 2008 -0400
+
+    Internalise some resource list API.
+
+commit 0ca4f3cee7e42a393cdd32d3a772a190ae68abc5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 13:29:55 2008 -0400
+
+    Unexport xf86EnterServerState
+
+commit c1df4fbede8058c15ce3a5759a7758fecafbb9e7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 13:08:43 2008 -0400
+
+    Unexport (and unimplement) xf86SetAccessFuncs.
+    
+    Because, no.
+
+commit 44269e604eb60ebaa6189fd4409d39a4ec6b9f4b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 13:02:50 2008 -0400
+
+    RAC: NO_SEPARATE_*_FROM_* are useless.
+    
+    If anyone can come up with an example of a bus where:
+    
+    - both i/o and memory resources are addressable
+    - access to them can be controlled
+    - but they can't be controlled independently
+    
+    then by all means, reinstate this logic.
+
+commit 51fcb58f45824c7cde88b8b4ccbd6bdcf760280e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Oct 3 12:39:49 2008 -0400
+
+    RAC: AccessEnable() and AccessDisable() are mandatory.
+
+commit 9c5fc7762e9ca09847965e67e247d95dfc197266
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 3 11:24:34 2008 -0700
+
+    Partially reverts commit 505c216d030a8eb6e9fa757ecebed9597a850c88.
+    
+    I don't know how the hell git-cherrypick messed that up to delete fbwindow.c
+
+commit 7bb73a9513710feaebc127998950e9f472bfcc0d
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Sep 30 23:53:12 2008 -0600
+
+    XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
+    instead of calling CFRunLoopRun() directly.  The leak wasn't reproducible on
+    this machine, but someone was able to produce a leak trace with Instruments
+    that indicates it was leaking in the CFRunLoopRun() path.
+    
+    x-input.m: dequeue and ignore events when pbproxy_active is false.
+    
+    x-selection.h: add an is_active method that is used by x-input.m to ignore
+    events.
+    
+    x-selection.m: Handle nearly every preference, except for primary_on_grab,
+    which I don't really understand yet.
+    (cherry picked from commit 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
+
+commit 2a5ce41f0371ad5df52586b8d4072578b6206321
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Sep 30 13:54:08 2008 -0700
+
+    XQuartz: Use "pointer" and "pen" for device names to please GDK.
+    (cherry picked from commit 00ca0f4d839abf47e9573a1552473e039cf787e6)
+
+commit d3f597a986dcbc7e4164f350300dbd2e438949d8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Sep 30 11:10:58 2008 -0700
+
+    XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
+    (cherry picked from commit 9a91d770a6411dd876187e64a8bda1f0745169ae)
+
+commit 1657dfb843c0127ea31bfd0a8ef81d0c394cbc7b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Sep 30 08:46:08 2008 -0700
+
+    XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
+    (cherry picked from commit d79ccb45f68b65d65718b5b77efe2fae6eeda762)
+
+commit 88bb8c6f485a7aaf40f684d484a33cfedfa74a70
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 29 22:33:02 2008 -0700
+
+    XQuartz: Removed resolved comment about localization.
+    (cherry picked from commit 8ed5faf058ac7b0782a9cc13a2c58b80168358d2)
+
+commit b1d0b196617643619d24ed520b0a1161e26b66c6
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Sep 30 13:04:35 2008 -0600
+
+    XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
+    
+    Remove some unnecesssary headers.
+    
+    Remove some dead code that was never called or used in pbproxy.
+    
+    Make use of an NSAutoreleasePool in x_init.  It could potentially cause a leak
+    on a startup without this.
+    
+    Start adding reload_preferences to the x_selection class, as well as event
+    handling for that.
+    (cherry picked from commit 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
+
+commit ecd260143cf9f012f033ba029ad04cb49567c89a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 29 22:32:24 2008 -0700
+
+    XQuartz: Added some localizable strings that were missing.
+    (cherry picked from commit 2c8205ea8b709c5859412b466e83aec7a94acdcf)
+
+commit aae878b89081ffba16386e8d4987469313049bea
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 29 22:26:20 2008 -0700
+
+    XQuartz: Actually send the pointer event from the pen even if it happes to actually have 0 pressure and 0 tilt.
+    (cherry picked from commit f41583761955cb9c92c43239bfaa8ae0e5d95e33)
+
+commit b7ad86ff8a9115147c0cf02af9e80ec464129392
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Sep 27 15:30:10 2008 -0700
+
+    Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
+    (cherry picked from commit c2012138a520560f8a2160518ea73fced410c3b7)
+
+commit 5446adebfb085dd05471729bf5c55bf820b1cbe3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 3 11:12:49 2008 -0700
+
+    XQuartz: Send AppleWMReloadPreferences where appropriate.
+    (cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
+
+commit 6020c3fbfe06530cb2b90178d17a7d63beae028a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 3 11:09:26 2008 -0700
+
+    XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
+    (cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
+    (cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
+
+commit 505c216d030a8eb6e9fa757ecebed9597a850c88
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 3 11:11:37 2008 -0700
+
+    Added dep on applewmproto 1.1.0
+    (cherry picked from commit b350b066740a2e72585153e35478538cf1bca9ef)
+
+commit 1c1a6e965da412e767ad8bc15a5362116d64c6b0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Sep 22 22:09:19 2008 -0400
+
+    Remove an utterly, utterly ancient changelog.
+    
+    Wow.
+
+commit 9c8a2be2c73abf06245b1eb7f05f93e104dcfe42
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Oct 2 08:55:14 2008 +0930
+
+    dix: fix axis scaling.
+    
+    For two axes [a, b] and [x, y] (inclusive), the formula to scale point P(ab)
+    to (x,y) is:
+        (P - a)/(b - a) * (y - x) + x
+    
+    And the whole end result rounded of course to get the integer we need.
+
+commit 93ef72fa26b27cf90bf5c64ec19ac295a113aaae
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Sun Sep 28 21:47:21 2008 +0930
+
+    dix: don't lose subpixel precision when scaling.
+    
+    Only scale x/y back from screen range if we have crossed screen, otherwise
+    leave it as it is.
+
+commit 5ef5e89f0e4b9b8820093e072430e295efce32fa
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Sun Sep 28 22:32:44 2008 +0930
+
+    dix: fix non-initialization of pointer accel in master devices.
+    
+    Init MDs always with PtrAccelNoOp.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 036d424827726b0c804ae1532109253270744207
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Sep 26 17:01:12 2008 +0930
+
+    xfree86: don't let DGA steal key events outside of [9,255].
+
+commit 56a24cf894a142b18c7f18e294074c32031f3d14
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 2 17:56:31 2008 -0400
+
+    xorg.conf.man: We don't look in root's ~ anymore, don't say we do.
+
+commit 7921c4a0bfc843c772dcb2fc185d4bcab1316330
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 2 17:08:48 2008 -0400
+
+    Remove some stale IPv6 debugging
+
+commit f836e1f11b7bf3449c3e469cc7799c4ed28d2356
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 2 17:03:54 2008 -0400
+
+    Unifdef ISC
+
+commit b1a31734731a768d586b4cb18317d4a5c5e20fa8
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 2 17:03:21 2008 -0400
+
+    Fix bad preprocessor line
+
+commit 00f01f39454001846869496d9124f62c01e5691a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 2 15:48:18 2008 -0400
+
+    Don't inherit XAUTHORITY from the environment.
+    
+    It's not especially obvious, and unpleasantly overloaded for the Xnest
+    case.  Typically this gives you a server that looks for its auth data in
+    the authority file you were using for the running X session, which
+    generally doesn't have an entry for the display you just started.
+    
+    All the major dm's, and startx, pass -auth explicitly, so this shouldn't
+    cause too much upheaval.
+
+commit eb8be3e90a9c90a428696026d1e3b2152d7eefb4
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Sep 25 14:16:20 2008 -0600
+
+    XQuartz: pbproxy: Fix another STRING bug.
+    
+    Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
+    terminate the string, which lead to a bus error.  So, we use
+    lengthOfBytesUsingEncoding: to get the length in bytes instead of
+    strlen().
+    (cherry picked from commit 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
+
+commit edfa3f8233fde490cb4255f21473684e96d595a3
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Sep 25 12:29:57 2008 -0600
+
+    XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying.  Now I can copy and paste to/from rxvt correctly.
+    (cherry picked from commit 82a4dc5f0f31a7911ee1cce5d1b162077befa811)
+
+commit 12a59c44cb68843a60fc43257930d1cbeb971b7a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 24 22:51:03 2008 -0700
+
+    XQuartz: Fixed threading issue with TSM.
+    (cherry picked from commit 93ab4e0071670bb80bfa1170dd97ed9d6d51c67a)
+
+commit ee87c9b02401a7a08b396884ba412a503b078bbd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 24 18:57:36 2008 -0700
+
+    XQuartz: pbproxy: Removed stray SPI include.
+    (cherry picked from commit 2fb2bc77b804d7b63002c1423cb0bfc658eeee45)
+
+commit 591cc57627a9137159fb5a13287c1d61d8d2fc8c
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Sep 23 13:59:25 2008 -0600
+
+    XQuartz: pbproxy: Fix 3 paths that could leak memory.
+    
+    2 of the paths leaked, when INCR transfers were done.  Now we
+    are leak free according to the leaks program for all transfers
+    I have tried so far.
+    (cherry picked from commit aa98db576bc02f0765cb35d0282a894ba3778213)
+
+commit 586fbc91df731150ff5e39170efe33f3cfac28a2
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Sep 23 12:39:32 2008 -0600
+
+    XQuartz: pbproxy: Fix NSObject memory leaks by properly using the
+    NSAutoreleasePool.   Now the usage is consistent.  In x_input_run()
+    we create a pool, and release it after processing the XEvents.
+    
+    Add some getpid() output to main for debugging.  It needs a bit more
+    testing before the next release.
+    
+    Don't retain the NSPasteboard as the old code did.  That may have
+    contributed to the leak, and it made it so that we needed the
+    NSAutoreleasePool created in main().
+    
+    Remove the _known_types, and _pasteboard instance variables from
+    the x_selection class.  They aren't needed anymore.
+    
+    The leaks program now indicates 0 leaks after some usage.  I want
+    to test further, but this seems much better, and my memory usage
+    graph indicates it's not growing.
+    (cherry picked from commit b245d84a72ee3929546cd11a6eba3c60fb4a4d95)
+
+commit 238999cfc99dbf306184f0e846465a8707bcc9d2
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Sep 22 17:36:21 2008 -0600
+
+    XQuartz: pbproxy: Add a comment to pbproxy.h about how the DB()
+    macro causes a leak (according to the leaks program).
+    
+    Attempt to fix several other leaks with release method calls.
+    For some reason the process still grows more than it should...
+    
+    I will need to use some better methods than leaks, and malloc_history
+    I suspect.  Whatever is leaking, it's hard to find.  I need to isolate
+    the cases more.
+    
+    Add a missing image/jpeg branch.
+    
+    Remove read_prop_32 - it's not used.
+    (cherry picked from commit 63a680354dcb545fef935ac97596dd35ceaed960)
+
+commit 106eb37e0214bbd864a59119b491abfc54f32629
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Sep 26 13:05:10 2008 +0930
+
+    Require inputproto 1.9.99.5
+    
+    Pull and rebuild your input drivers, while you're at it.
+
+commit fbd09486c6e6c64db28d81caa5ef04821e49f2eb
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Sep 23 16:55:04 2008 +0930
+
+    Push server-known properties into xserver-properties.h.
+
+commit a2d83b9dc8387ec7e70689db1371cf6500b2f68e
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Sep 18 18:21:03 2008 +0930
+
+    Xi: add "deletable" flag to properties, add DeleteProperty handler.
     
-    (cherry picked from commit b6ab114212c0e4c3346ceb5b207f14c526ab81e7)
+    A property can only be deleted if any of the following is true:
+    - if a property is deletable and all handlers return Success.
+    - if a property is non-deleteable and the all handlers return Success AND the
+      delete request does not come from a client (i.e. driver or the server).
+    
+    A client can never delete a non-deletable property.
+
+commit 22e90472681ebc7bdd28f82bbf2753a5b259e931
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Sep 18 16:12:02 2008 +0930
+
+    Xi: allow Set/GetProperties to return a status, and honour this status code.
+    
+    If a property handler now bails out, return the error code to the caller. This
+    allows to be slightly more specific with the errors.
+
+commit 1e24e7b9df3d02350c7ea18e9379e87fe4d00026
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Sep 18 15:58:46 2008 +0930
+
+    Xi: remove configure/query device property calls.
+    
+    This removes all the meta-information about device properties (pending,
+    fromClient, range, valid_values, immutable).
 
-commit e88df87851232d6b6c8da5fff802b33f5275b050
+commit feaa5fa6712c8c6f4ca97766e2ac0338253cf3b8
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Sep 25 11:03:22 2008 +0930
+
+    xfixes: realize the invisible cursor before displaying it.
+    
+    AllocARGBCursor realizes the cursor but can only do so if we have devices
+    there already. If we don't - then the cursor needs to be realized elsewhere.
+    This is usually done in InitializeSprite, but since xfixes just hard-swaps the
+    (realized) cursor to the InvisibleCursor, we need to manually realize it
+    before trying to display it.
+
+commit e58be0f3425fb3e946a222077672c3c01308f887
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Sep 23 10:01:30 2008 +0930
+
+    config: print error code if NIDR fails.
+
+commit 30c3c13f1030268aaa6a3598d538fafd0592d77a
 Author: Peter Hutterer <peter.hutterer@redhat.com>
 Date:   Mon Sep 22 11:10:46 2008 +0930
 
@@ -335,9 +7091,8 @@ Date:   Mon Sep 22 11:10:46 2008 +0930
     with the explicit key type.
     
     The protocol spec does not cover this case, so we have to guess here.
-    (cherry picked from commit 30c3c13f1030268aaa6a3598d538fafd0592d77a)
 
-commit be3b3cb970d040f0db4bead018c338012547334f
+commit ae986d1c73d2f720bd0309d8c33328d14e8eed25
 Author: Peter Hutterer <peter.hutterer@redhat.com>
 Date:   Fri Sep 19 18:27:24 2008 +0930
 
@@ -357,47 +7112,359 @@ Date:   Fri Sep 19 18:27:24 2008 +0930
     for the other gruops.
     
     X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
-    (cherry picked from commit ae986d1c73d2f720bd0309d8c33328d14e8eed25)
 
-commit 3bf826f59013ec14fbcf19b85a03e2967a821661
-Author: Kim Woelders <kim@woelders.dk>
-Date:   Mon Sep 22 08:37:29 2008 +0930
+commit 5bf3f0fd4e00f96cfebd14b58580c3c8733626fb
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Thu Sep 25 15:40:19 2008 +1000
 
-    xkb: fix use of uninitialized variable.
+    exa: make sure pixmap devPrivate.ptr is NULL at create time
+
+commit 82f150d73cc9a7d8eaf7241a51b03af05bcec159
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Wed Sep 24 16:56:45 2008 -0700
+
+    GLX: Make sure GLX_SGI_make_current_read is enabled when possible
+
+commit 8d9defe8c2a685709318c1d43379443df3d2322a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Sep 24 10:11:00 2008 -0400
+
+    Fix un-suppressing the initial cursor.
     
-    And some cosmetic changes to use stuff->change consistently.
+    The intended behaviour was "show as soon as someone calls
+    XDefineCursor".  What you actually got was, uh, slightly less well
+    defined, since the screen's ChangeWindowAttributes hook would run after
+    DIX handled the cursor change.  Oops.
     
-    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-    (cherry picked from commit 8c46505d7d91e0644b19cccc4b342fceb6f86cab)
+    The trivial way to turn the cursor on is:
+    % xsetroot -cursor_name gumby
+    
+    Refer to /usr/include/X11/cursorfont.h for cursor names.
+    
+    Thanks to anholt for catching this.
 
-commit 88ebde608daaca4793e1b637302899ba65d165ec
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Oct 6 20:10:25 2008 -0700
+commit a39377cbcbd3091095efbeab25bec18ae520147e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Sep 23 09:22:07 2008 -0700
 
-    Remove usage of mfbChangeWindowAttributes missed in e4d11e58c...
+    Revert "Render: Use built-in SHA1 library"
+    
+    This reverts commit d3bd31fddff7894f89ba80a3cdddff49aff08db8.
+    
+    X.org should not be providing a custom SHA1 implementation.
 
-commit af8cef461c4d107f7a03645568a635d0458da9b8
-Author: Alan Hourihane <alanh@tungstengraphics.com>
-Date:   Wed Sep 24 14:24:36 2008 +0100
+commit 10a9bac0257b381367cedff395b40425d584bf59
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Sep 23 09:21:37 2008 -0700
 
-    only build dri2 when DRI2 is enabled
+    Revert "Update COPYING for SHA1 code"
+    
+    This reverts commit 64387c8573ca8b3909667e32d7a9fba9567b21d3.
+    
+    X.org should not be providing a custom SHA1 implementation.
+
+commit 64387c8573ca8b3909667e32d7a9fba9567b21d3
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Sep 23 19:05:14 2008 +0300
+
+    Update COPYING for SHA1 code
 
-commit 97f688f2b4b8ebfba77be00db68c4e6a555a5d62
+commit d3bd31fddff7894f89ba80a3cdddff49aff08db8
+Author: John Tapsell <johnflux@gmail.com>
+Date:   Tue Sep 23 18:56:32 2008 +0300
+
+    Render: Use built-in SHA1 library
+    
+    Getting an external library for SHA1 is a mess, so just use our own,
+    regrettably.  Public domain implementation.
+
+commit 991ed2949ba682684952fe323f8f0f51ebdca98e
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Sep 23 14:51:33 2008 -0400
+Date:   Tue Sep 23 10:22:22 2008 -0400
+
+    Rename SaveSetMap() to SaveSetShouldMap().
+    
+    Avoids preprocessor collision with xfixeswire.h
+
+commit ca9fae00795a114bca4397c32b543d6326a4c547
+Author: Owen Taylor <otaylor@redhat.com>
+Date:   Mon Sep 22 12:42:41 2008 -0700
+
+    Change 'remap' to 'map' in saveset functions/macros
+    
+    Now that the code has been fixed so that Unmap means unmap and not "don't
+    remap", 'remap' was confusing to have in the function names/parameters, so
+    change it to simple 'map'.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ad14239a358cf65e5702ec7d054aa1db4f1cdd68
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Sep 22 11:26:49 2008 -0400
+
+    Upgrade GLX Public License 1.0 to FreeB 2.0.
+    
+    According to the press release:
+    
+        Previous SGI contributions to the free and open source community
+        are now available under the new license. These contributions
+        include the SGI® OpenGL® Sample Implementation, the GLX™ API and
+        other GLX extensions.
+    
+        [...]
+    
+        "SGI has been one of the most ardent commercial supporters of free
+        and open source software, so it was important to us that we continue
+        to support the free software development community by releasing our
+        earlier OpenGL-related contributions under this new license," said
+        Steve Neuner, director of Linux, SGI. "This license ensures that all
+        existing user communities will benefit, and their work can proceed
+        unimpeded. Both Mesa and the X.org Project can continue to utilize
+        this code in free software distributions of GNU/Linux. Now more than
+        ever, software previously released by SGI under earlier GLX and SGI
+        Free Software License B is free."
+    
+    "The GLX API" is here read to include the original GLX source release
+    from:
+    
+    http://www.sgi.com/products/software/opensource/glx/download.html
+    ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz
+    
+    which includes glxext.c as included in XFree86, from which our copies
+    in glx/ and hw/dmx/glxProxy/ are derived.
 
-    xserver 1.5.1
+commit 722c51960dd4948b8a64f8eff115fa69da597ef9
+Author: Owen W. Taylor <otaylor@redhat.com>
+Date:   Mon Sep 22 11:04:26 2008 -0400
+
+    Don't remap windows for SaveSetUnmap
+    
+    Since ReparentWindow() does a unmap/map pair for windows that are already
+    mapped, for saveset windows with SaveSetUnmap, we must unmap the window
+    before calling ReparentWindow() to avoid the generation of MapRequest
+    events, and so forth.
 
-commit 68c575cb73fd6ff6c9c0ce29a3d8105da44abfcc
+commit 0bb317a78b96fddcdac319c9706b3a12f931ea44
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Sep 23 11:05:44 2008 -0400
+Date:   Mon Sep 22 10:51:51 2008 -0400
+
+    Default to -br.  Add -retro option for the nostalgic.
+    
+    -retro also reverts to the classic cursor display behavior, meaning,
+    the cursor will be visible before anyone calls XDefineCursor().
+
+commit ab17f88506a2dde32c50ff72b03743cd9c384ecc
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Mon Sep 22 01:59:31 2008 +0200
+
+    Don't use our version of ffs() if the system has one
+
+commit af0d5e2ef7b1b3f42e3522568c5f56850823c102
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Sep 20 19:41:46 2008 -0700
+
+    XQuartz: 64bit crash fix ... don't pass pointers through xe.
+    (cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
 
-    Move RELEASE_DATE below AC_INIT.
+commit 852a0b0dde34e7179394d96d09122b99bf7fe904
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Sat Sep 20 17:49:16 2008 -0600
+
+    XQuartz: pbproxy: Add an X error handler that returns 0.
+    
+    Move the struct atom_list into the x-selection class, so that it's
+    no longer a global variable named atoms.  This may ease pthread
+    integration and reduce the chances of symbols conflicting.
+    (cherry picked from commit c1403c713ca80104ae3736bd2ed1eb6ffa5192b6)
+
+commit 7fa6fc5ad0b12bc52a1c22906709fbb003782d11
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Fri Sep 19 21:28:46 2008 -0600
+
+    XQuartz: pbproxy: Fix a bug that occured when a PICT format was available.
+    We may need another branch to convert a PICT to a PNG or JPEG.  For now
+    TIFF works well in all of the test image copying apps when converted to
+    PNG or JPEG with an NSBitmapImageRep class.
+    (cherry picked from commit adf339d8f948fc1e308dbcae38fcfce504b5b0ab)
+
+commit f67490ceb5b9ddf25e734cc331705103599f3ed8
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Fri Sep 19 14:29:37 2008 -0600
+
+    XQuartz: pbproxy: Make the proxy handle copy request races, and PRIMARY
+    INCR transfers mixed with a CLIPBOARD change.
+    
+    Fix a bug with some UTF-8 transfers.  I can only guess that my UTF-8
+    tests before were inadequate.  I can now copy/paste any characters between
+    uxterm and Textedit.app.
+    (cherry picked from commit 7ca1532e8e6e2c733c9c508eee0de73d09ecb947)
+
+commit b666ffd78155db228174041e9d7460b8a07dde0f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 19 13:15:07 2008 -0700
+
+    XQuartz: "Disable" the text when syncing is disabled.
+    (cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
+
+commit dba290ec231422740f453b69b187f80df3f50e4b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Sep 21 17:40:35 2008 -0700
+
+    XQuartz: Added a preferences UI for pbproxy options.
+    (cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
+
+commit a928cae57b47625c9e3d136840d3e5d17fd3c51e
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Fri Sep 19 00:18:44 2008 -0600
+
+    XQuartz: pbproxy: Add a missing include of Xutil.h.  Another header
+    seems to have done this before, but correctness matters.
+    (cherry picked from commit 1b4987e779d97b90669bac2405a4672085677f7c)
+
+commit 749bdf19b2a50201fddd04207e31122470f435e3
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Fri Sep 19 00:02:48 2008 -0600
+
+    XQuartz: pbproxy: Add COMPOUND_TEXT handling.  Do misc. cleanups with testing
+    to verify that the behavior didn't change.
+    
+    main.m: XInternAtom compound_text, and atom_pair.
+    
+    pbproxy.h: Add compound_text and atom_pair to the struct atom_list.
+    
+    x-selection.m: Add an #include of Xutil.h.  Refactor the reply struct
+    initialization to be done in a common place.  Add send_reply: to simplify
+    the code a bit more.  Add send_compound_text: which handles the
+    COMPOUND_TEXT type.  Add the beginnings of a send_multiple:.  Change
+    handle_image:extension: to handle_image:.  The extension: message isn't
+    needed anymore.
+    (cherry picked from commit 1e9460abdf5bafe46215966bbef3e796cb1c33e0)
+
+commit 00bfbee59fe3b0c8d1a55d1851206857ca563ece
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Thu Sep 18 13:10:41 2008 -0600
+
+    XQuartz: pbproxy: pbproxy now responds to selection request events.
+    
+    We can now copy and paste images to and from X11.  Text copying and
+    pasting works as well.
+    
+    The NSPasteboard can contain TIFF or PICT images, and pbproxy will
+    translate to an image/png or image/jpeg request, and list those in the
+    TARGETS.
+    
+    I added a description of the basic design at the top of x-selection.m.
+    
+    I removed the request_data x_selection class struct.  It's not needed.
+    (cherry picked from commit 4a8daf884694c9c420c45d427f1f84e608e7e48f)
+
+commit 811e9f5e9e9c07f4b8fb1e9a4d9df91a2e359221
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Wed Sep 17 11:59:36 2008 -0600
+
+    XQuartz: pbproxy: Use an NSBitmapImageRep to convert an "image/png" selection
+    to a TIFFRepresentation for use with NSPasteboard.
+    
+    This has been tested with the Gimp and works with some minor quartz-wm changes.
+    The Finder clipboard shows the image updates after an Edit -> Copy.
+    (cherry picked from commit 12912adaeea759d30f96d8ae51a84fd1659ea0ac)
+
+commit d8d555bac77509248d1145e928a2edf500b326b9
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 17 10:11:00 2008 -0700
+
+    XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet
+    (cherry picked from commit 1317c8ff94c4bd32617a5398e929f667bd87da58)
+
+commit 23ec8261b6a746cb84e1328284fdc5587bca6faf
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Sep 16 21:09:22 2008 -0600
+
+    XQuartz: pbproxy: The greedy CLIPBOARD handling now works for text.
+    
+    This change adds some [self own_clipboard] calls in the necessary places to get the proper greedy behavior.
+    
+    UTF8_STRING and STRING properties seem to work well now with the test cases (PRIMARY, and CLIPBOARD).  I can copy from several different X apps, and have the behavior be correct when pasting.  I also verified that quartz-wm isn't doing the copying, by disabling the quartz-wm paths.
+    (cherry picked from commit 934669f732c28f07b9d934d8f8f0b63ccfebd900)
+
+commit 7c2eb3d41af33d1c52500111d0d34f9aab8a4542
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Tue Sep 16 15:21:18 2008 -0600
+
+    XQuartz: pbproxy: return the TARGETS list as a 32-bit list to fix a bug that was in the original.
+    
+    Add TRACE() calls where appropriate to try to figure out why we are losing CLIPBOARD at times, after transferring PRIMARY to the NSPasteboard.
+    
+    Use the new pbproxy_clipboard_to_pasteboard where appropriate.
+    (cherry picked from commit 40190675a6c1889cca3574e5d1a9c16ab74315a7)
+
+commit 81c836902dc5b0b83cd95262d48cbc4c81ff3ae2
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Sep 15 13:35:46 2008 -0600
+
+    Rename reclaim_clipboard to claim_clipboard.
+    
+    Convert the puts usage to use DB().
+    
+    Add the initial handle_image method.
+    
+    Check for nil in the NSString instantiation in various places.
+    
+    Add some commentary to enhance the clarity of why I did some things.
+    (cherry picked from commit 37361567b65241eab64e8b30cd9729d0e71a86d2)
+
+commit 85e23affea7bf9aa7615b0292e67f170266d85f8
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Sep 15 13:31:19 2008 -0600
+
+    Add an image_jpeg Atom.
+    (cherry picked from commit ea9dc27977c5eab666f2aa2d914e4e28d36758c7)
+
+commit 6b42f40ff9b9ff3e74ccbb2ce5cfad65016934de
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Sep 15 13:28:50 2008 -0600
+
+    Rename reclaim_clipboard to claim_clipboard.
+    (cherry picked from commit d333a8e2b5514b8b76a78c6a13a3f5149ea8de27)
+
+commit 2ab56981b1a64138d6c1f9ecfb75655477b3e575
+Author: George Peter Staplin <gps@Georges-Workstation.local>
+Date:   Mon Sep 15 13:27:08 2008 -0600
+
+    Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
+    (cherry picked from commit 32b175ef62b68a971784e51e937e358cb10e20ac)
+
+commit cbd32645f7d1054f79ad137a16766da1076c610e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 15 09:33:55 2008 -0700
+
+    XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
+    (cherry picked from commit 21a2d0b8d03faf1c66ec0c5c11fbd2ab24547727)
+
+commit 5b397642cdc29920245ebe64cc85243cac893e0e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Sep 14 09:23:17 2008 -0700
+
+    XQuartz: pbproxy: First round of updates to pbproxy from George.
+    (cherry picked from commit 5c8b956f8f3f17e8d577d97cb66424954be72684)
+
+commit dac9e91870f9c787eac97c9d7d0607979c57eb5b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Sep 21 17:32:24 2008 -0700
+
+    mieq: Made custom event handlers safer for nevents >1
+
+commit 8c46505d7d91e0644b19cccc4b342fceb6f86cab
+Author: Kim Woelders <kim@woelders.dk>
+Date:   Mon Sep 22 08:37:29 2008 +0930
+
+    xkb: fix use of uninitialized variable.
+    
+    And some cosmetic changes to use stuff->change consistently.
     
-    Doing it the other way around clobbers the setting, which means you get
-    a null release date string in the log.  Thanks autoconf!
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
 
-commit dba26368e5dbdd35df97d38ed517d1248503ab51
+commit 2b266eda6e23d16116f8a8e258192df353970279
 Author: Peter Harris <peter.harris@hummingbird.com>
 Date:   Thu Dec 20 15:58:01 2007 -0500
 
@@ -406,9 +7473,105 @@ Date:   Thu Dec 20 15:58:01 2007 -0500
      Fix panoramiX request and reply swapping
      Set window and screen values in panoramix replies
      Prevent buffer overrun in ProcPanoramiXGetScreenSize
-    (cherry picked from commit 2b266eda6e23d16116f8a8e258192df353970279)
 
-commit ce6424853c2df2486ad99c0369974afc91a92993
+commit 03ab8f11d25b0ca39a3b37b5350bca4c1028768e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Sep 18 12:17:05 2008 -0700
+
+    When resizing a window with redirected descendents, don't expose them
+    
+    Bit/window gravity computations need to recompute exposures to manage the
+    bits which are saved by gravity during the resize computation. That's easy
+    for non-redirected windows where the bits are all within the parent's
+    pixmap. For redirected windows, we don't need to deal with this at all, so
+    just skip the whole re-computation adventure.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d26083fe02658e7312a8da6a5b11652f9fe57bc8
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Sep 18 12:14:58 2008 -0700
+
+    Switching from Automatic to Manual redirect needs to unmap/remap
+    
+    When changing a window from automatic redirection to manual redirection, the
+    parent clip list needs to be recomputed; the easy way to get that computed
+    right is to unmap/map the window, just as when redirecting the window the
+    first time.
+    
+    Thanks to Owen Taylor for helping diagnose this.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8bfd88ca61a1747714781a090d1c9dd8f3ad5dfc
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Sep 19 12:13:43 2008 -0400
+
+    Revert accidental edid changes from previous commit.
+
+commit 69b79c1a6648f0d04a1b37a728b2e3d76233530f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Sep 19 12:02:28 2008 -0400
+
+    Update to SGI FreeB 2.0.
+    
+    Under the terms of version 1.1, "once Covered Code has been published
+    under a particular version of the License, Recipient may, for the
+    duration of the License, continue to use it under the terms of that
+    version, or choose to use such Covered Code under the terms of any
+    subsequent version published by SGI."
+    
+    FreeB 2.0 license refers to "dates of first publication".  They are here
+    taken to be 1991-2000, as noted in the original license text:
+    
+     ** Original Code. The Original Code is: OpenGL Sample Implementation,
+     ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+     ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+     ** Copyright in any portions created by third parties is as indicated
+     ** elsewhere herein. All Rights Reserved.
+    
+    Official FreeB 2.0 text:
+    
+    http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
+    
+    As always, this code has not been tested for conformance with the OpenGL
+    specification.  OpenGL conformance testing is available from
+    http://khronos.org/ and is required for use of the OpenGL logo in
+    product advertising and promotion.
+
+commit cc20112a65d3f641ce0261c86a541f94fae5215c
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Sep 19 08:44:04 2008 +0930
+
+    Xi: don't include client-side headers.
+    
+    Spotted by Mikhail Gusarov.
+
+commit e76b5b5e731e2d6c61ff6e6e9b2f42b20ac473d5
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Sep 18 14:51:15 2008 +0930
+
+    dix: calloc, not malloc, ValuatorClassRec.
+    
+    For master devices, the ptraccel code could segfault on free since we'd be
+    dereferencing random memory. Callocing the valuatorClassRec is the easy fix.
+
+commit f789408f7dbfe57a0111e185ac83d1c70f262ba8
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Aug 25 14:52:35 2008 +0930
+
+    Xi: remove broken SDeviceEnterNotifyEvent, replace with ...Leave...
+    
+    The event format is the same for both (bar the type), so one is enough.
+
+commit 97b9374a8af5a4cc52f9074feb4ce40cf0b90796
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed Sep 17 15:48:56 2008 -0700
+
+    Conditionalize Composite-based backing store on pScreen->backingStoreSupport.
+    (cherry picked from commit 37876602957924c7cff759a800eddd574ee2385a)
+
+commit b4762c0245ed2966606171cf27f40aa745fdc76e
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Tue Sep 16 17:13:42 2008 +0200
 
@@ -416,49 +7579,221 @@ Date:   Tue Sep 16 17:13:42 2008 +0200
     
     They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6
     ("Reimplement ShmPutImage.")
-    (cherry picked from commit b4762c0245ed2966606171cf27f40aa745fdc76e)
 
-commit 37876602957924c7cff759a800eddd574ee2385a
+commit 52bbfc5bfa64fd09ef625f35a2fb4a0518003825
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date:   Mon Sep 15 10:43:46 2008 -0400
+
+    scrnsaver is optional at build time.
+
+commit b6ab114212c0e4c3346ceb5b207f14c526ab81e7
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Sep 12 19:11:53 2008 -0400
+
+    Array-index based devPrivates implementation.
+    
+    Note: DevPrivateKey is now pointer-to-int, which means
+    each key now needs to point to some global storage of
+    size at least sizeof(int).
+
+commit 999f3362d50a753c1801d565766219808efdb1a5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 5 17:32:16 2008 -0700
+
+    XQuartz: Dead code removal
+    (cherry picked from commit 43184cd379c4fb7254391b8a362016cbf89b5529)
+
+commit 6548a55ebdf43231a3c48debf54aa5aa2f1aa956
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 5 17:05:03 2008 -0700
+
+    XQuartz: 256 color support
+    (cherry picked from commit 8dd6d5c825d457f26b41b79d02d57ed4a5ecf1f5)
+
+commit bad7cd14c2021b14971b3f707f927803a053003e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 5 10:46:36 2008 -0700
+
+    XQuartz: Dead code removal
+    (cherry picked from commit bf10fb0b1f776e72db7c76db11f764e26f9d62c4)
+
+commit 1119fe136f8731f26fc6f50b92f5ddf78f3f83be
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 5 10:46:20 2008 -0700
+
+    XQuartz: Changed around fd handoff model to be more robust
+    (cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b)
+
+commit 183233b27beb441742a53e440c3389b4ea125b8a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 12 15:25:44 2008 -0700
+
+    XQuartz: Don't warp the pointer on server start for XQuartz
+    (cherry picked from commit c0da576d4921c246a9ac747921b48ab9e718347f)
+
+commit 7a46dd30d332bc1d42f82b0391e806d3b067ebbd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Sep 4 09:18:40 2008 -0700
+
+    XQuartz: Dead code removal
+    (cherry picked from commit 2e45344870f5d17181df6407da3448991036d783)
+
+commit 1c70e53f2560cb877c8b149034f296232de67a4e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Sep 4 08:55:22 2008 -0700
+
+    XQuartz: Fixed proximity logic errors for tablets.
+    (cherry picked from commit d942849f248c368b92ca73e145e8a5bc339112d7)
+
+commit c661c6ae7a9cd981f914484aa4c3007922280def
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Sep 4 08:07:32 2008 -0700
+
+    XQuartz: Remove decls of crashtracer strings that we don't use anymore in here
+    (cherry picked from commit 4a653c6bfd270f2960a8c7e726e7628cfc3c9051)
+
+commit 54162aca404a7de2e560cc2aea01445e14742efe
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Sep 4 05:18:31 2008 -0700
+
+    XQuartz: Fixed a crash in RootlessNativeWindowMoved
+    (cherry picked from commit a16048cec08e173ce42a78a77704f5fdfcb4480f)
+
+commit ce781cac1b52003da6c025cd29e2c2ad97dbb324
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Sep 11 16:24:20 2008 -0700
+
+    Fix distcheck.
+
+commit 31c62495f1de6e9ba41e1f6d7fa263eeb849129b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Sep 10 13:11:09 2008 +0800
+
+    Drop a reference to user mode after create
+    
+    User mode has no customer when create until assigned
+    to some output.
+
+commit 079625570d51e41569b73b2fd9237eb8f967f408
 Author: Aaron Plattner <aplattner@nvidia.com>
-Date:   Wed Sep 17 15:48:56 2008 -0700
+Date:   Mon Sep 8 08:50:52 2008 -0700
 
-    Conditionalize Composite-based backing store on pScreen->backingStoreSupport.
+    Bump ABI major versions for the TryClientExceptions change from commit 883811c.
 
-commit 05fb2f9e1249d0b91bf4318cec4fb309217adff4
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Sep 3 19:14:22 2008 -0400
+commit 4e004c68283828660f2259a4a4120a84667dcafa
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date:   Mon Sep 8 09:16:59 2008 +0800
 
-    xserver 1.5.0
+    Revert "randr: fix user mode create initial reference count"
     
-    Drinkin' island is inside each of us, my son.
+    This reverts commit 7c5ca85a9e6d49ab572831b3e0c08bb4cafb395e.
 
-commit f385303cd0242e3a7fded15f8b5c3d610c13ee41
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Sep 2 15:43:15 2008 -0400
+commit 40a9482f8c5b3eac86c221ccce78510e850f4d2b
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date:   Fri Sep 5 06:09:51 2008 -0700
 
-    Fix strict-aliasing silliness in XAA.
-    (cherry picked from commit 613ce0955032fb032de0a3940752828d314f057a)
+    Add cscope files to .gitignore
 
-commit 6cb7f595b97e9442a79660bc639b2fc91842e19a
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Sep 3 14:59:24 2008 -0400
+commit bf333c2f9833a178887e7bdd7fc338f1e09c387f
+Author: John Tapsell <john.tapsell@john-desktop.(none)>
+Date:   Wed Sep 3 12:20:17 2008 +0100
+
+    fbdevhw: Remove pixclock check.
+    
+    The check can fail because the output from FBIOGET_VSCREENINFO is used to set
+    Clock in fbdev2xfree_timing().  Then in fbdevHWSetMode(), xfree2fbdev_timing()
+    is called which sets the pixclock based on Clock.  The resulting circle results
+    in slight rounding errors, causing the comparision check in fbdev_modes_equal
+    to fail.
+
+commit 47bf269d5922a4998c33908a53ad1affa8de96c0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 12:54:56 2008 -0700
+
+    mieq: Fix my broken cherry pick.
+
+commit 1669308be6d4cc6265e5fa8ef47fbf2cbef6f093
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 09:23:06 2008 -0700
 
-    Disable DRI2 by default.
+    XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
+    (cherry picked from commit 1f842c71c35db031a24de646429834d6054adf1d)
+    (cherry picked from commit 144746223d8dc3f6ff2a0e805aa27a6e57df558a)
 
-commit ed2248f673ed8993e678818c388203346a3614e0
+commit 46168b3b404164c1f2e7876031e70fb77192fe75
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 09:11:25 2008 -0700
+
+    XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
+    (cherry picked from commit 6bca78760951cb5cb57ea66b7631a2dc230dc27a)
+    (cherry picked from commit fafcafd6de39cf6b5967793f03b30b49db36fec5)
+
+commit 7f5318131ddf86bed5797c0d9641f6ff34f34be0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 03:54:42 2008 -0700
+
+    XQuartz: Removed "Done" button from Applications Customization.  Now properly save on exit.
+    (cherry picked from commit 2f1e163d5db6063e54fcaa045ea67c29ce3e46aa)
+    (cherry picked from commit 7542c00b96461c3474b8c23545171c4b6ddfd29d)
+
+commit 9e70a3cf58c205948f6a415e203d825e9b660d9d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 09:33:39 2008 -0700
+
+    mieqProcessInputEvents: Check custom event handlers first.
+
+commit 700e8bf33f9b1c3921de912b8110fadf5e0626da
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 02:41:20 2008 -0700
+
+    XQuartz: Updated man page
+    (cherry picked from commit 6932d0d19ea75c64ed38b82a246b68c6bbfb8cec)
+    (cherry picked from commit 8e3da36b6b0a261975808bc67b5caca733a1a23d)
+
+commit 7430bb9093ea8cf9589d745742c7353e53a144f8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 02:37:09 2008 -0700
+
+    XQuartz: Removed dead code (unused option definitions)
+    (cherry picked from commit 3d74f77490105c0704c0b10dc7a6eb859bf6e985)
+    (cherry picked from commit c1e5ea9ba058f6a13f564165a3d6862335729630)
+
+commit b3836e5bdd7e2e04e563246d90f385e1b4741baa
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 3 02:36:39 2008 -0700
+
+    XQuartz: Cleaned up our sleeping before adding the launchd socket.
+    (cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
+    (cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d)
+
+commit 7c5ca85a9e6d49ab572831b3e0c08bb4cafb395e
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date:   Wed Sep 3 09:41:00 2008 +0800
+
+    randr: fix user mode create initial reference count
+    
+    Don't need extra reference count adding when creating user mode.
+    This fixes user mode destroy, otherwise we get BadAccess error.
+
+commit 4e1f9f51a9eea115ce2a073824e9c5cef4e2f364
+Author: Daniel Drake <dsd@laptop.org>
+Date:   Tue Sep 2 16:20:40 2008 -0400
+
+    Don't try to destroy a NULL pixmap.
+
+commit 613ce0955032fb032de0a3940752828d314f057a
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Sep 3 14:58:43 2008 -0400
+Date:   Tue Sep 2 15:43:15 2008 -0400
 
-    Disable XTrap build by default.
+    Fix strict-aliasing silliness in XAA.
 
-commit 9bb4990c917cc512d39b5889e7bcecb5cfcbeb56
+commit b5cdcfa55c399e83d51242e93d4f25d8bc4fec1f
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Mon Sep 1 19:45:30 2008 +0200
 
     Xevie: swap replies as necessary
-    (cherry picked from commit b5cdcfa55c399e83d51242e93d4f25d8bc4fec1f)
 
-commit bcea1095da2d29f5812bd1adabac334cfca60355
+commit d3ae193f4ac87530f2745f8cb5e7b70dd516881e
 Author: Thorvald Natvig <slicer@users.sourceforge.net>
 Date:   Mon Sep 1 19:36:56 2008 +0200
 
@@ -469,73 +7804,190 @@ Date:   Mon Sep 1 19:36:56 2008 +0200
     to the client, it hangs.
     
     X.Org bug#17394 (http://bugs.freedesktop.org/show_bug.cgi?id=17394)
-    (cherry picked from commit d3ae193f4ac87530f2745f8cb5e7b70dd516881e)
 
-commit 67ed1f23fe29affe14587fbb809d0e95197db78b
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Thu Aug 21 01:32:03 2008 +0200
+commit 0466b8811ce8ebc1d993f177cbb7a22e997640f1
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Sep 1 09:57:25 2008 +1000
 
-    Add swapped dispatch for randr 1.2 requests
-    (cherry picked from commit 01264f17925005969c3b71ca945fc1014bcd8c8e)
+    exa: drop cw.h inclusion
+    
+    this doesn't seem to be needed, at least I can't see any warning without it.
+    
+    I'd like to build EXA into a driver and cw.h isn't exported
 
-commit 62524d9d7648cfd9e2d7d6a3312ff20722d7f6a5
-Author: Thomas Bodzar <Thomas.Bodzar@quest.com>
-Date:   Sat Aug 30 15:34:29 2008 +0200
+commit 881bd15f445bb62c3fdea863c968c95217408b6e
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Sun Aug 31 18:07:22 2008 +0200
 
-    Xorg.man: typo (the the).
-    (cherry picked from commit 229e60db8f95232afc8cdcb7cd0572d117c84b90)
+    xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
+    
+    - Fix is courtesy of math_b.
+
+commit f4e9a1a98f97155de62908309e87c10487125926
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Sun Aug 31 17:45:08 2008 +0200
+
+    damage: choose less ambiguous function names
+
+commit 0cd6709db5febbe7fbd073e429421fcd81041e08
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Aug 30 16:13:58 2008 -0700
+
+    XQuartz: Fixed editing of Applications menu
+    (cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
+
+commit c4d290fc54542ccba7c3a46bc75b0c3322d0ca48
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Aug 30 14:19:47 2008 -0700
+
+    XQuartz: Fixed missing symbol in quartzKeyboard debugging
+    (cherry picked from commit 8ad55e484f0ba9073ce07a03de660cc546a7b668)
 
-commit 57fa9fd4a59be14f4c77c3dac501ef40ff656752
+commit 5d7d959b1143979c3445639c9d108e02da0c1475
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Aug 30 14:18:07 2008 -0700
+
+    XQuartz: Don't even build with GLX support since swrast now depends on libdrm
+    (cherry picked from commit 3739525d57dff2b3b034b5768f357b1c25577909)
+
+commit 45def7f0a342f4733cafb06adbfed14932f0e01b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 29 22:16:03 2008 -0700
+
+    Removed dead glcontextmodes
+    (cherry picked from commit c6d0ac7471209d835e8d9a25adcbda893ddfa1cb)
+
+commit d01c5ca7935a8340a3cd68c325da6dfec005c952
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Sat Aug 30 15:35:32 2008 +0200
 
     Xserver.man: Typo (the the).
-    (cherry picked from commit d01c5ca7935a8340a3cd68c325da6dfec005c952)
 
-commit 7f42ed6ca938d0dee66bdfd6237b6632a4f7ab0d
-Author: Daniel Drake <dsd@laptop.org>
-Date:   Tue Sep 2 16:20:40 2008 -0400
+commit 229e60db8f95232afc8cdcb7cd0572d117c84b90
+Author: Thomas Bodzar <Thomas.Bodzar@quest.com>
+Date:   Sat Aug 30 15:34:29 2008 +0200
 
-    Don't try to destroy a NULL pixmap.
-    (cherry picked from commit 4e1f9f51a9eea115ce2a073824e9c5cef4e2f364)
+    Xorg.man: typo (the the).
+
+commit 1885582444fb06da73dea1f118a777bea26e1dc1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 29 21:18:26 2008 -0700
+
+    XQuartz: Placate automake which doesn't like escaped newlines even in comments...
+    (cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)
+
+commit 8abcc12fdd5bd9edc0288a1ab8f75e65ffcb8c71
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 29 20:55:25 2008 -0700
 
-commit 48744d20b1d23b731604db10dda85a10f62664dc
+    XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
+    (cherry picked from commit aaf0f71db197526b6b866cc1b39fbdfe051879ef)
+
+commit aee19c7b5542aa147b89b1ae8340e9931d81729f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 29 03:54:55 2008 -0700
+
+    XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.
+    (cherry picked from commit 25eccf12c89d73b8bce2c9be14841efb230acedc)
+
+commit 974db58f5b730c3770ee461665a02dd4334d1dea
 Author: Maarten Maathuis <madman2003@gmail.com>
-Date:   Sun Aug 31 18:07:22 2008 +0200
+Date:   Sat Aug 30 00:37:11 2008 +0200
+
+    damage: initial attempt at a damage marker mechanism
+    - This should allow drivers to recieve post submission events for X<->opengl synchronisation.
+    - Lacking a testcase, i'm open to suggestion how to do it better.
+    - The idea is:
+     - driver recieves event
+     - driver creates personal identification and inserts marker into X fifo.
+     - when something wants to use an X pixmap, it checks if something is pending.
+     - If so, it synchronizes the 2nd fifo using the initial identification.
+    - Driver is not required to use interrupt based systems (price too high).
+    - Lower latency is ofcource better.
+    - If this is somehow unusable for you, then come up with improvements.
+    - For that reason i wouldn't consider the api fixed for the moment.
+
+commit 454cb0802eec3c2c2cdbcc17971bced868462b83
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Aug 29 22:28:02 2008 +0200
 
-    xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
+    damage: DamageReportRawRegion should set pDamage->damage
     
-    - Fix is courtesy of math_b.
+    - I found no evidence in the protocol, that it should be differently from all the other modes.
+    - It seems to have been like this from day 1.
+    - If anyone has evidence to the contrary, please enlighten me.
 
-commit 580e96d6d4355acae6314105a3a8e4c7a4d6e3ea
-Author: Xavier Bestel <xavier.bestel@free.fr>
-Date:   Tue Jul 29 13:06:10 2008 -0400
+commit ae6ca434104405302f30a58bde8738d9579d9dc9
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Aug 29 22:21:54 2008 +0200
 
-    Cosmetic fix to EDID decoding.
-    (cherry picked from commit bb2cacd33eb85f39b9e7fa554545611957df677d)
+    damage: internal functions start with a non-capital letter
 
-commit d0ef93430505d110e0d3c0552dad3361db33b369
-Author: Fredrik Höglund <fredrik@kde.org>
-Date:   Mon Aug 18 19:27:34 2008 +0200
+commit 1861250cd7e84b05e8298b74e3c7e97da72ddfba
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Fri Aug 29 22:15:23 2008 +0200
 
-    Fix the tile offset in miPaintWindow for ParentRelative windows.
-    (cherry picked from commit 244a635fcdc9e0a7212d51b26d74f49d8e1b071f)
+    {damage,exa}: sanitise damage
+    
+    - Redo damage naming for more consistency.
+    - Call post submission functions only where appropriate.
+    - EXA can now live without it's odd damage workarounds.
 
-commit 05472534cfefe6057b908cc7d698967eecb5dde4
-Author: Daniel Drake <dsd@laptop.org>
-Date:   Thu Jul 24 21:06:34 2008 -0500
+commit 5af77d43fe812e127d5d335527fa940ab9d95f38
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Aug 11 16:59:17 2008 -0400
 
-    Don't abort if swrast library is not present
+    DRI2: Drop sarea use, implement server side swap buffers.
+
+commit 60ad8d5d05485339e89d7f1f9f1ded75de7c7ea1
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Aug 28 23:45:17 2008 -0400
+
+    Attempt getpeercon() on remote sockets as well as local ones.
+
+commit ebea78cdba0ff14a397239ee1936bd254c181e1b
+Author: Tomas Carnecky <tom@dbservice.com>
+Date:   Thu Aug 28 18:05:40 2008 -0400
+
+    Prepare for array-index based devPrivates.
     
-    GLX is enabled by default, but the current swrast behaviour causes X
-    to abort with fatal error if the swrast dri library dlopen fails.
+    TODO: static indices can be made just an int; some indices
+    can be combined.
+
+commit ec7907f8fa04dcff2649cc4846975844314f737e
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Wed Aug 27 19:27:13 2008 -0400
+
+    Add an array of integers for use as per-screen cursor private keys.
     
-    Handle the case where the swrast library is not present, and do not
-    register the GLX extension unless at least one screen has a usable
-    GL provider.
-    (cherry picked from commit eff25430b4a391409e39337962ff7697165d23c7)
+    Replaces the use of the screen pointer itself as the key, which was
+    nice but won't work now that an array index is being stored.
+
+commit 86898491497a43814caf42013651086e62fe6162
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Wed Aug 27 19:17:15 2008 -0400
+
+    Remove unused GetGlyphPrivatesForScreen.
 
-commit 4652c51e92ab21df020f83be3dc1ca1c897f6cf9
+commit 90b178cc7feda1f9c4995b98364739e71233fff3
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Aug 28 19:36:22 2008 -0400
+
+    Don't need to request space for Xnest pixmap private.
+
+commit 835b532d6f51d08998d7ab49fcb41db8266487ce
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Aug 28 14:49:35 2008 -0400
+
+    Build fix.
+
+commit 040212ee60af9d043c4c3f98bba5120c3b8e33f7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Aug 28 13:49:35 2008 -0400
+
+    MIT-SHM pixmaps, if they exist, are ZPixmap.
+
+commit ee7c684f21d220d5e046bab31ae617a7d64d60f6
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Aug 27 16:05:47 2008 -0400
 
@@ -548,17 +8000,100 @@ Date:   Wed Aug 27 16:05:47 2008 -0400
     
     Also remove the (broken) damage tracking for same from EXA, since it didn't
     work right, and is now superfluous.
-    
-    (cherry picked from commit ee7c684f21d220d5e046bab31ae617a7d64d60f6)
 
-commit ef0780b7384b1d8257698b07091dd5214d64c4c1
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Thu Aug 28 23:45:17 2008 -0400
+commit 2db1afbf2e56d8743c701d81a5797001ce9e5c52
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 26 23:09:20 2008 -0700
 
-    Attempt getpeercon() on remote sockets as well as local ones.
-    (cherry picked from commit 60ad8d5d05485339e89d7f1f9f1ded75de7c7ea1)
+    XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
+    (cherry picked from commit c8244177b0dbcb28d2f5509e6f2a3e8057889790)
+
+commit 319405fa4a530804c19fb7d0fcece5c912e41c9d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 26 21:11:35 2008 -0700
+
+    XQuartz: Fixed needed xplugin version. ><
+    (cherry picked from commit 01b3a99dff79e0d2b316e02658c19fa79d9144ae)
+
+commit 3350770bd6d90fefa1133ac738c1d4eae2d568a6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 26 19:13:56 2008 -0700
+
+    XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit.
+    (cherry picked from commit e7658e745f8a3eaf5cec9f54a8a1b7e5a7708e09)
+
+commit 7930ea9116f232a3762f0085e5ca65e06d1142fc
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Aug 25 22:10:46 2008 -0700
+
+    XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
+    (cherry picked from commit 54a882dcbdccef3f3eb4e6398e13c88185a8986c)
+
+commit dc1171df5baa0c4aa366ff2b07af5b8eb44dae12
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 22 01:12:37 2008 -0700
+
+    XQuartz: Fixed bogus args to debug ErrorF
+    (cherry picked from commit f0351c2b80f30ae31f041798b84139141fc3d5a5)
+
+commit ac936525afe46bad329387232f8d48e77f6a4175
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 22 01:11:33 2008 -0700
+
+    XQuartz: Cleaned up mouse event translation a bit more.
+    (cherry picked from commit c286f2a718fdaf6ad10249b59abb20731da8d904)
 
-commit 78f50cd5758d778a5b01aa607c04919b69a5a47f
+commit 1b42f550001c11c93d5a2144df98a5c687c010c2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 22 00:45:12 2008 -0700
+
+    Xquartz: Added missing ev_type for NSTabletPoint event.
+    (cherry picked from commit 07548f13947a212dcc020d52fe0ad679255121e2)
+
+commit 13a89f19208cf998808ff2896b7711310768f94c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 20 10:21:23 2008 -0700
+
+    XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
+    (cherry picked from commit fcdc9f8b5abd724d75f53d48fdadbed9859e9e79)
+
+commit dd1e54d6eed0bce289517b3cb95e6b1a187ca6e0
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Tue Aug 26 20:02:55 2008 +0200
+
+    exa: fix thinko from 988725f32e082aee9392a71464125157a83d1e67
+    - the drawable of the pixmap is not the same as the original drawable (possibly a DRAWABLE_WINDOW)
+
+commit 7c14fdbacfcd2f4d56a346e6c72e44e4ba9909c1
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Tue Aug 26 17:21:43 2008 +0200
+
+    exa: some minor cleanup
+    - Fix compile warning
+    - Order exa.h by source file that exports the function.
+    - Move the function i created earlier to private headers.
+
+commit de79edbd9f67762950eaac2dc79668035239897c
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Tue Aug 26 17:03:12 2008 +0200
+
+    exa: report damage manually for exa{Trapezoids,Triangles} when needed
+    - Plus a micro cleanup of unused variables.
+
+commit 988725f32e082aee9392a71464125157a83d1e67
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Tue Aug 26 16:54:29 2008 +0200
+
+    exa: move destination damage for internal calls to a special function
+    - This should improve clarity for someone who isn't familiar with the code.
+
+commit ce193476808f54d946351458361c62132d81b62f
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Tue Aug 26 13:18:58 2008 +0200
+
+    exa_glyphs: remove useless offset
+
+commit fd94651fc3a6f49ec153ffb823b86c1d125bb298
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Tue Aug 26 10:58:35 2008 -0400
 
@@ -567,7 +8102,342 @@ Date:   Tue Aug 26 10:58:35 2008 -0400
     We don't actually send the float mode so just drop it.  Drop a couple of
     other unused or redundant fields from GLXconfig.
 
-commit c662381a14d2c69cc8b4aa1c66763cbaf6addc5d
+commit 41bd8d5dfe27d5c91fe7e4cdba1475a2a0741b1c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 25 11:27:26 2008 -0400
+
+    EDID: Build fix.
+
+commit 76ed409acd772f2c041239345c6dc64cbef0e5b2
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 25 10:44:45 2008 -0400
+
+    EDID: Publish the whole block on the root window if we've got it.
+
+commit 5724f7fb5bea6fa1a354c64c0972c53d70e2f27b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 25 10:39:36 2008 -0400
+
+    EDID: Publish the whole block in the RANDR property if we've got it.
+
+commit 668f89eba3e8f9da7843f5cb350f8dc1e5d7efbe
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 22 10:32:18 2008 -0700
+
+    Remove unnecessary #ifdef __SOL8__'s
+
+commit cc78d977cac74fcfb7c9b27e7109a1e369018dd8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 22 10:14:11 2008 -0700
+
+    Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check
+    
+    Upcoming virtual terminal support changes in Solaris kernel will provide
+    <sys/kd.h> on SPARC too, so this gets us ready for them.
+
+commit 95b466e457542bfe08b0ed2bbb5db8d28a961cfd
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Aug 21 17:24:40 2008 +0930
+
+    Xi: don't include .c files.
+
+commit c696da75c7326c5e1f1cd48292c0519ddc22e11b
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Thu Aug 21 17:23:11 2008 +0930
+
+    Xi: swap devices property replies.
+
+commit 01264f17925005969c3b71ca945fc1014bcd8c8e
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Aug 21 01:32:03 2008 +0200
+
+    Add swapped dispatch for randr 1.2 requests
+
+commit e02f864fdf19a5ab1682336be343c57fdb69ef43
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Aug 20 13:24:03 2008 -0400
+
+    Suppress cursor display until the first XDefineCursor() request.
+    
+    Yes, this means the server will start without showing a cursor.  Pretty
+    much any application that wants to interact with the mouse will define
+    cursors, so this essentially just delays showing it until gdm (or
+    whatever) loads.
+
+commit 64ef7ed072007b1d0b4de5ff1e5eababa418c794
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Aug 20 13:14:03 2008 -0400
+
+    Centralize declaration of ConnectionInfo.
+
+commit f1f44940f10b0209946ec0f08104a372d7d945a0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 20 09:50:54 2008 -0700
+
+    XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
+    (cherry picked from commit 81187364e512606a6aebb95ab2967d9d420f57f2)
+    (cherry picked from commit f2ec79e4a159dec6481691e4dd615db01770dd7a)
+
+commit 6c5612c2e1df1e89388ffff97251f5328558f8e8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 20 09:21:44 2008 -0700
+
+    XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu.
+    (cherry picked from commit e4110861d307a55d9032cb83cf024ec1f294e8d7)
+    (cherry picked from commit fcfc05482a88696cb713c7a2ddfcf935ae8378a6)
+
+commit bdc277c9b3dc6b3b95f74b20a49ce163c5fae980
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 20 09:58:48 2008 -0700
+
+    XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
+    (cherry picked from commit 745bc8ab387d6794f47d8b9dca33b4c81f6dd39c)
+    (cherry picked from commit a28a2be52478a1557a363140f7bd70ececf144dc)
+
+commit ed42108920cc695b96ed57bf9dcfea1470e74669
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 19 02:02:11 2008 -0700
+
+    XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command
+    (cherry picked from commit 02af74d7a5a7225f408915254c40856159dc7f19)
+    (cherry picked from commit 2da32894dff8340f6ca7c980277fca7ec835a193)
+
+commit be06961312e2111778bfd97b2c8a927acc61f43d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 20 09:56:06 2008 -0700
+
+    XQuartz: More input fixes
+    stuck-modifier fixes (capslock)
+    3button-emulation now doesn't send the modifier key with the click
+    Added other options to fake_button2 and fake_button3 defaults options:
+    	({l,r}{control,alt,command,shift})
+    (cherry picked from commit 8fb6a1cf44c35a20dfb0c05c9824f94898f88da7)
+    (cherry picked from commit ae9c1b3cfb3874b4d1251681c24bda91c398bcab)
+
+commit 436b659091dd17bb3e316377ba31f5d2a5dfa12e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Aug 14 09:34:12 2008 -0700
+
+    XQuartz: Updated bundle version to 2.3.1
+    (cherry picked from commit eedecba0b882bb07931e8d9168589f5be7a08a69)
+    (cherry picked from commit 7d9d864461858b25c5eb5858fdf4b53771795f11)
+
+commit bc4cef1d0ae7cbb8f5fe16d576db45abd4330370
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date:   Mon Aug 18 16:28:33 2008 +0200
+
+    exa: remove useless cache{X,Y}off from UploadToScreen() arguments.
+
+commit 38bdc34d555f956a1ff1e1bb8eef95e3ba2bac64
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 15:12:39 2008 -0400
+
+    Remove redundant check.
+
+commit 47b31233c26f710be70ffcca17e5402d03d5733f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 15:10:12 2008 -0400
+
+    Simplify driver setup.
+    
+    No point warning about missing driver hooks, that just means the person
+    who gave you the driver is inept.  Might as well just crash.  Also,
+    just name anonymous screens as screen%d instead of failing after the 36th
+    screen.  Bonus points if you can figure out what the failure mode would
+    be on the 36th screen, and what the effective screen limit was.
+
+commit b99fc65b53769400821a2bd8f691ece35a5b8847
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 15:06:53 2008 -0400
+
+    Simplify calling xf86EnableIO() a bit.
+
+commit b1f2c7a89ace1f6e5750783f3c43c4c5a6d24374
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 15:06:11 2008 -0400
+
+    The ->Identify hook is not mandatory.
+    
+    Best comment ever though.  Mad props.
+
+commit af5125968a738ec8f496d04eb65acb7c8f812115
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 14:47:10 2008 -0400
+
+    Refactor misprite a bit.
+    
+    No variable declarations in header files, please.
+
+commit 41b68e0dea9305d66bca2fc4ad96db01f5342c6d
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 11:02:31 2008 -0400
+
+    Remove unused -co option.
+    
+    What did this even do anyway?
+
+commit 1f416fba994ed7a7e072a9f0a86b515855ea3bac
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 10:56:45 2008 -0400
+
+    Remove unused -bestRefresh option.
+
+commit 5a72c45d42abc7227c6cf3d14fd7043ea7527c54
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 10:54:11 2008 -0400
+
+    Remove unused -showunresolved option
+
+commit 9f08ffc557b52e2e8cd54fb692b66700c83d61c6
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 10:29:23 2008 -0400
+
+    Remove unused xf86Info.pMouse
+
+commit f227fbf74f0c619ecf3275cdb4c10b1a4b3a8cfc
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Tue Aug 19 11:36:12 2008 +0200
+
+    EXA: Inline Prepare/FinishAccessWindow into only caller, ChangeWindowAttributes.
+    
+    Also check the requested mask in addition to the GC state before doing work.
+
+commit 825b3fe11d1b813bf8d5b24a880ed04b78ae1acf
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Tue Aug 19 11:22:40 2008 +0200
+
+    EXA: Don't use exaGlyphs if the driver doesn't provide a PrepareComposite hook.
+    
+    It's buggy without Composite acceleration (leading to cropped glyphs) and not
+    really useful in that case anyway. The bug probably still needs to be found and
+    fixed for drivers that provide a PrepareComposite hook but can't accelerate
+    text rendering though.
+
+commit 75e495a4cd823b6fa42a8d167ecc9f4723320dea
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 17:58:08 2008 -0400
+
+    Remove unused xf86Info.mouseLocal
+
+commit b3dfd7e3e4deef21b40c885f8e7eae34b55888b2
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 17:56:18 2008 -0400
+
+    Remove unused xf86Info.sharedMonitor
+
+commit 5e43cd28692bc05cac80f38b47104a26c0524385
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 17:46:42 2008 -0400
+
+    Remove the remainder of grab deactivation and closedown.
+
+commit cd1e8f26147919227e7624ac4c6b313d972a4d35
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 17:40:46 2008 -0400
+
+    Remove unused EstimateSizesAggressively option.
+
+commit faaf0046155abbd15415d5a6b62ead4f58935c28
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Mon Aug 18 17:23:26 2008 -0400
+
+    Remove xaaTEGlyphBlt.S
+    
+    Should have been removed in 593144dddd977f53bcd1a115f9544eeece46df4c but
+    ajax was asleep at the wheel.
+
+commit 562462e78dd6a5e2ed5b36aa22be52f31d55485d
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Mon Aug 18 17:05:24 2008 -0400
+
+    Remove dead {bsd,lnx}Resource.c
+
+commit e3e47b35e369bf4abb0fe15865acca0b34600b1f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 17:03:22 2008 -0400
+
+    Remove MAX_PCI_{BUSES,DOMAINS} and some associated #if 0.
+
+commit 593144dddd977f53bcd1a115f9544eeece46df4c
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Mon Aug 18 16:46:36 2008 -0400
+
+    Remove some unused assembly code and assyntax.h
+
+commit 2d3e478384ef8af2a760f39792e35e4a6174c967
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 15:09:44 2008 -0400
+
+    int10: Fix int1A for %ax == 0xB101.
+    
+    pciNumBuses was pretty much always 1 post-pciaccess.  That ain't good.
+
+commit 539717fe1f08a000d1eef9f345d24cb49e3663b5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 14:50:33 2008 -0400
+
+    Remove (unused) pciMaxBusNum.
+
+commit 3c03d9f1efbbacec6e8be58da99bf0977a8e0fec
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 14:37:42 2008 -0400
+
+    Remove sparcPci.c
+    
+    There is no way this code can have been building for anyone since pciaccess
+    was merged.  BSD and Linux were already using OS code on sparc, the only
+    people who could want this are Solaris, who should be using pciaccess
+    anyway.
+
+commit 9a39b6cfbda306eb594e87ce828afa01cd7aa01e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 14:26:01 2008 -0400
+
+    Remove XF86SCANPCI_WRAPPER.
+
+commit 470b05a610e641094d46742393684acd786d78a8
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 14:03:36 2008 -0400
+
+    Remove vestigial MAX_PCI_DEVICES.
+
+commit 244a635fcdc9e0a7212d51b26d74f49d8e1b071f
+Author: Fredrik Höglund <fredrik@kde.org>
+Date:   Mon Aug 18 19:27:34 2008 +0200
+
+    Fix the tile offset in miPaintWindow for ParentRelative windows.
+
+commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 13:13:03 2008 -0400
+
+    Remove PciProbeType and associated weirdness.
+    
+    This code was effectively only used in ix86Pci.c to select PCI config
+    access type.  Nobody should be using that path anymore, in the glorious
+    pciaccess world; kernel services should get it right for you.
+
+commit 95bb6f53624a3e6f4d62a2f789982c5544d2fc70
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Mon Aug 18 11:47:19 2008 -0400
+
+    Remove ancient unused inline hack.
+
+commit e1ae8db625b5e8c298a557592ef23656b3da4886
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Aug 18 09:53:48 2008 -0400
+
+    Drop dead PowerPC PCI code.
+    
+    Also add a warning for anyone still using legacy PCI code.
+
+commit 99583b43a9a202d047ff417d47485e4c0e0c9670
+Author: Jie Luo <clotho67@gmail.com>
+Date:   Sun Aug 17 23:13:22 2008 +0200
+
+    glx: avoid possible NULLptr deref, fix #16884
+
+commit 421b7e8f12083e9518fa7deda968a2f73c9a0006
 Author: Maarten Maathuis <madman2003@gmail.com>
 Date:   Sun Aug 17 19:57:02 2008 +0200
 
@@ -575,7 +8445,299 @@ Date:   Sun Aug 17 19:57:02 2008 +0200
     
     - I guess failing PrepareAccess is rare, since this a 3 year old bug.
 
-commit 582f1381ae07a35c345f940181a8847dc67eb927
+commit 1e62e773273539352bc21b2da5262678dd3fc7df
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Aug 15 15:19:44 2008 +0930
+
+    Require inputproto 1.9.99.4
+
+commit 609c04b62bdb0e86f33860069033c7142eecf210
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Aug 15 14:51:59 2008 +0930
+
+    dix: stick a warning in about loss of subpixel precision.
+
+commit de1573172ad2c2e98c101727930a468213295783
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Aug 13 13:11:44 2008 +0930
+
+    Backport device properties to XI 1.5 instead of XI 2.0
+
+commit 8b9ed7dec2954d4890ddcc7c874fc0832b16495a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Aug 14 09:08:14 2008 -0700
+
+    XQuartz: Fixed a stuck modifier key bug.
+    (cherry picked from commit eeb6e5a9e98dcf045ec230f160d5992080dceba6)
+
+commit 1770c85374883229ec5e9685229b2333e62705e6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Aug 14 07:32:37 2008 -0700
+
+    XQuartz: Made 3-button mouse simulation a little more consistent.
+    (cherry picked from commit d207b037d2ae213369e5627a17d8831c9bc16ad8)
+
+commit f51f77d25e69b51fa3fd557ffdb5573b61759706
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 13 19:09:05 2008 -0700
+
+    XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
+    (cherry picked from commit b287c481e1cbe77ff84d10a708505f148a0c8434)
+
+commit 04956b80431169e0ae713a3e6ba4cdc157ce3a66
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Aug 9 10:07:32 2008 -0700
+
+    Transport/Apple: Add TRANS_NOXAUTH to incoming connections when the listener is flagged as such
+    (cherry picked from commit ba4a7924261070ad0aff7211b7a1c9581fad4646)
+
+commit e6813e8de65eee854bbffe6ab0f8ba158f43b10b
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Wed Aug 13 14:24:45 2008 +0930
+
+    Xi: byte-swap device property requests.
+
+commit 0ce687634fa5e0d955e896a0d0d5f584a4cfd1a4
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Aug 13 17:28:08 2008 -0400
+
+    Eviscerate save-under support.
+    
+    Use a compositing manager already.  Plus I really wanted to use 'eviscerate'
+    in a commit message.
+
+commit f456f32cd97684052cab4712e7f4c827132c554b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Aug 13 16:21:28 2008 -0400
+
+    Build fix.
+
+commit c1e9b7dc6f4600fe6c301aecd7d67461cb884df0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Aug 13 14:13:55 2008 -0400
+
+    Sledgehammer off the DRI2 build system.
+
+commit 544bfd06663ff71bc5275459cf74a3557530544f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Aug 13 11:09:54 2008 -0400
+
+    Remove xf86Version.h and related API.
+    
+    We haven't meaningfully been API-compatible with xf86 modules in ages,
+    let's stop pretending.
+
+commit 139c3ab7b754dc425a09d5f7b6d2a8fb2b88138a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Aug 12 17:49:49 2008 +0930
+
+    Xi: return the state from the correct keyboard in QueryDevicePointer.
+
+commit 998375f4154b000f75b2bafd4e276c0237d24dc7
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Tue Aug 12 17:49:16 2008 +0930
+
+    dix: remove superfluous check.
+
+commit 9f9268821b13038556fbc029df54ab0e9b2aa77f
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Mon Aug 11 13:52:38 2008 -0400
+
+    The smart scheduler is not optional.
+
+commit 2e2ce817ce404a5e000c9750fa96f656fed370b8
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Aug 10 23:07:46 2008 +0200
+
+    Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
+    
+    And make sure os.h is included in files that use it.
+
+commit 02efa78ce2da470b252289ff2af598d06bc84ece
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Aug 10 18:29:35 2008 +0200
+
+    add libXinerama to the list of dependencies.
+    
+    Now that panoramiXext.h is installed bt libXinerama, it becomes required
+    to build Xext.
+
+commit be2210b69defa225d8bc4bb90d94bfd740ef8b1f
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Aug 9 23:43:50 2008 +0200
+
+    remove OpenBSD/amd64 specific mtrr API.
+    
+    The old code never worked anyways and was removed from OpenBSD.
+    OpenBSD/amd64 4.4 and later support mtrr with the same API as
+    OpenBSD/i386.
+
+commit 6e33e6f355f7f04e77a165eb67b1414724c1fba3
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Aug 9 23:43:03 2008 +0200
+
+    Move string comparaison functions to from dix/ to os/.
+
+commit 5968634996c08656a0c5e2fa35705cf7afac87e6
+Author: Dave Miller <davem@davemloft.net>
+Date:   Sat Aug 9 16:45:59 2008 +1000
+
+    glx: fix crash in driGetConfigAttribIndex
+    
+    Don't access GLboolean via int pointers
+
+commit 4212599c922373a224d2235c74672a3a3aa8e0b1
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Fri Aug 8 12:17:58 2008 +0200
+
+    EXA: Make sure damage tracking code is inactive if the driver manages pixmaps.
+    
+    It was always supposed to be like that... It was only recently pointed out (in
+    a rather convoluted way) that it was not in fact the case.
+
+commit 073116cc44859e96374cde46325df8540621d5ee
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Fri Aug 8 12:15:27 2008 +0200
+
+    Remove commented out lines that make automake 1.9 puke.
+
+commit 666781cd9b62207e45eebd3eb55a930f3a345f72
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 8 01:41:28 2008 -0700
+
+    Removed rogue #include
+    (cherry picked from commit af238e99da45a4dd8d8cbb6564bb8d0a3d79d590)
+
+commit 4a0947bf06deacc3ae716730cfbbbeda1311bae3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 8 01:53:36 2008 -0700
+
+    XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
+    (cherry picked from commit 4545ba91e9d6ad62b6cafde3c73a672d3ded91a2)
+
+commit 5accc9b3ce1af539150d59b1800b66783fd3e947
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Aug 8 00:19:41 2008 -0700
+
+    XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
+    (cherry picked from commit 5854e712e9ebc210d2f8de6f5d4fb650944f314a)
+
+commit 465a9bb96e8a90e53e655b3245e22910201786d7
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Aug 8 17:37:06 2008 +0930
+
+    dix: don't try to create events if we don't have a screen. #16898
+    
+    A NULL screen may happen during server shutdown, when the output has been shut
+    down but the devices still generate events.
+    
+    X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898>
+
+commit d684f5760f40b682a8b879641300abe689a263c5
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Aug 8 14:18:01 2008 +0930
+
+    xkb: actually initialise sli before using it.
+
+commit e00cd54c1ac57ea6e7767e90592200f343d9d08a
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Thu Aug 7 11:06:21 2008 +0200
+
+    dix: remove misleading comment in ptrvelo.c
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 6ca34549b89e73e3e0ec3cb7585686b880534cef
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 7 16:27:57 2008 +0930
+
+    dix: remove obsolete FIXME comment.
+    
+    Thanks to Simon Thum for pointing this out.
+
+commit 2c3645581ee3f180d34e32c8016d5e4e1af4dca4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 7 11:55:10 2008 +0930
+
+    dix: SetModifierMapping should only apply to the ClientPointer and it's SDs.
+
+commit e1b286d495b760cf67ddf936eca11da50fba847a
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Aug 6 09:42:32 2008 +0200
+
+    dix: simplified debugging helper for pointer acceleration
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d95136e1510a48cc3ad066d880d56061fc6a42ee
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Thu Jul 31 00:39:03 2008 +0200
+
+    xf86: don't replicate dix defaults for pointer acceleration
+    
+    the defaults from InitVelocityData() or hypothetic driver-side changes
+    are now respected, not overridden.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4f333d53510b82db57cfac1bfea22422cbb7be79
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Thu Jul 31 00:33:38 2008 +0200
+
+    dix: simplify velocity tracking filters
+    
+    prefer fp-mul over fp-div and remove rather pointless check
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit bf084a0769eee36ff799e5e5f2d1e875c1ebcc51
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 6 13:36:43 2008 -0700
+
+    glcontextmodes.[hc] were not added with the removal of the meas symlinks patch.  Copied from mesa head 2008.08.06.
+    (cherry picked from commit 409e1dd1e9524b5c1a1ae58a759da77e587e3780)
+
+commit e72b1d21e44712e90595b1c31e67db6786d0d1bd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Aug 6 10:23:31 2008 -0700
+
+    XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
+
+commit d1b96cdea96f5321e0d254abde81cdaab2eca979
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed Aug 6 10:37:32 2008 -0700
+
+    Add an xf86PrintBacktrace wrapper around xorg_backtrace to aid driver debugging.
+
+commit 26d31ad1c7f4c550d73419ecf76912d844186b30
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 5 15:14:08 2008 -0700
+
+    XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
+    (cherry picked from commit a8f0d32216e321b8ae6da182be9b1ea792f6e004)
+
+commit 0ef3243fb59fa993a7a07a08debbd4329254c265
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 5 18:45:54 2008 -0700
+
+    XQuartz: More fd handoff cleanup.
+    (cherry picked from commit 199d2dcb708c9f9d6b9ede149ea0fe9fba6c007c)
+
+commit e7dd3dd8f311d3872e0c4c9c2ca22c00f9d11f59
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 5 14:33:03 2008 -0700
+
+    XQuartz: Fixed some errors / typos in the preferences pane.
+    (cherry picked from commit e1e0c398bbb50394b164394e1f1870016489c25b)
+
+commit 6836f9aac801c3add0ae4aece05b32e85a0c5f85
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 5 14:24:25 2008 -0700
+
+    XQUartz: UI Cleanup.  Removed done/cancel buttons from Applications->Customize
+    (cherry picked from commit d3157ca45c1f88edd040d721c1e944b9d2c090aa)
+
+commit c06e27b2f6fd9f7b9f827623a48876a225264132
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 16:42:15 2008 +0930
 
@@ -584,9 +8746,8 @@ Date:   Fri Aug 1 16:42:15 2008 +0930
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit c06e27b2f6fd9f7b9f827623a48876a225264132)
 
-commit 07e922a257dbe9fa9bd78915fd9d5f7a02d9df62
+commit d9ca9819e975e0f6832a320f8be5958e5d942f85
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 16:41:40 2008 +0930
 
@@ -595,9 +8756,8 @@ Date:   Fri Aug 1 16:41:40 2008 +0930
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit d9ca9819e975e0f6832a320f8be5958e5d942f85)
 
-commit 245fecf7cda8bf72da68882f367bf5211ab809c9
+commit 5ba87c3327786dd7c6e8e265a19c858e8faae8fd
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 16:41:08 2008 +0930
 
@@ -606,9 +8766,8 @@ Date:   Fri Aug 1 16:41:08 2008 +0930
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit 5ba87c3327786dd7c6e8e265a19c858e8faae8fd)
 
-commit a5c4b9db1279f90d13461667637a1395ad2c7491
+commit 7e45c80204e06562d4475741caea65bc8758f3c7
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 16:40:25 2008 +0930
 
@@ -617,11 +8776,8 @@ Date:   Fri Aug 1 16:40:25 2008 +0930
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit 7e45c80204e06562d4475741caea65bc8758f3c7)
-    
-    Includes follow-up fix d684f5760f40b682a8b879641300abe689a263c5.
 
-commit 8d4004b092844fbbcfae5562bb4d007de2e70b4b
+commit a609dbed7cf854a6ee9d33c7cf45615db9da1fb9
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 16:38:59 2008 +0930
 
@@ -630,39 +8786,28 @@ Date:   Fri Aug 1 16:38:59 2008 +0930
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit a609dbed7cf854a6ee9d33c7cf45615db9da1fb9)
 
-commit 8a18475848e83527060bca1ae7e44c36d18600fa
-Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date:   Wed Aug 13 16:50:55 2008 +0930
+commit e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Aug 1 16:37:39 2008 +0930
 
     xkb: ProcXkbSetCompatMap should work on all attached SDs.
     
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06)
-    
-    Conflicts:
-    
-    	xkb/xkb.c
 
-commit 5b3eb0a3af9dcaf44230b828332b75e774ab1a46
-Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date:   Wed Aug 13 16:49:33 2008 +0930
+commit 3c7740aa8f21c1fda4190a1bf5d6ce089db5e35b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Aug 1 16:36:00 2008 +0930
 
     xkb: ProcXkbSetMap should work on all attached SDs.
     
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit 3c7740aa8f21c1fda4190a1bf5d6ce089db5e35b)
-    
-    Conflicts:
-    
-    	xkb/xkb.c
 
-commit 2fa7edd30d5d48bf6fa83dc179bbf37e55e3b72c
+commit 31afd51dd49c0d0db2465fbc987044fab8b89f22
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 16:32:37 2008 +0930
 
@@ -671,107 +8816,243 @@ Date:   Fri Aug 1 16:32:37 2008 +0930
     If called with XkbUseCoreKbd, run through all attached SDs and replicate the
     call. This way, we keep the SDs in sync with the MD as long as core clients
     control the MDs.
-    (cherry picked from commit 31afd51dd49c0d0db2465fbc987044fab8b89f22)
 
-commit 50382652afc13021f041c42ae6e8893643ea2bfa
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Tue Aug 12 14:53:14 2008 -0700
+commit de4936d7482f820728efeef338a2041c7a9186d2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Aug 4 20:11:45 2008 -0700
 
-    Fix --disable/--enable-kbd_mode configure flag
+    XQuartz: Fixed proper processing of tablet button presses
+    (cherry picked from commit ca0babafa4e9cf1b67ec460655bffe569ac9c3e9)
 
-commit 5930aeb45e3849df6fc9abf7373599936d515ffa
-Author: Dave Miller <davem@davemloft.net>
-Date:   Sat Aug 9 16:45:59 2008 +1000
+commit b70a8ba3dc52b277194ab267a101a3fd15062685
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Jul 15 17:48:29 2008 -0700
 
-    glx: fix crash in driGetConfigAttribIndex
-    
-    Don't access GLboolean via int pointers
+    XQuartz: Nuke Sparkle.
+    (cherry picked from commit 4991f54a8d84a9a8df89a99dbfc09391195578f8)
 
-commit b61ee18b72d8b2c2d21ca68dc8566a09a76683fb
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Jul 17 18:16:59 2008 -0700
+commit 30851efdd4313506e92aeb6d3e5099dea99ab99c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Aug 5 12:54:51 2008 -0700
 
-    Make xstrcasestr prototype return value match the implementation
-    (cherry picked from 3b687ffe1649449b3d182f5e7690274c6c96916a commit)
+    XQuartz: Fixed first-client-can't-connect bug
+    Readded the old exec() server startup path for regression testing.
+    Don't use the dynamic fd addition code since it's not quite working correctly.
+    (cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
 
-commit b5932f176c1abffbe75d03b706a2f04a7ef1e5a0
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Wed Jul 16 02:59:51 2008 +0300
+commit 277a74bcbb7d0a93c4f2e1de11daabd8c5f93ee8
+Author: Tomas Carnecky <tom@dbservice.com>
+Date:   Mon Aug 4 23:26:00 2008 +0300
 
-    DIX: Add strcasestr from FreeBSD
+    Redefine clients as a fixed array
     
-    Add strcasestr for use on systems which don't have it.
-    (cherry picked from ad87c72edcc0d1f56658e0c4e73af335c8d5a516 commit)
+    This removes yet another xalloc() each server generation. Also, I
+    couldn't find the corresponding xfree() so I guess that used to be a
+    memory leak there.
 
-commit ce10b41f1b3f8c9be705823b0c0f0379f2bcb516
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Wed Jul 16 02:03:36 2008 +0300
+commit 5532d63488ec45953ff7f925cfb4f87adb3b04a0
+Author: Tomas Carnecky <tom@dbservice.com>
+Date:   Mon Aug 4 23:06:08 2008 +0300
 
-    dix: Actually build str(n)casecmp if we don't have it
+    Redefine WindowTable as a fixed array
     
-    Remember to add stuff to dix-config.h when you add new AC_DEFINES,
-    people ...
-    (cherry picked from 69b57dc651e12a0d9a5a4295b185c62d5c0df63f commit)
+    Instead of xalloc'ing it every server generation. The array is always
+    the same size (MAXSCREENS), anyway.
 
-commit 8a319335fa960be04f85a119ed557e62101021ec
+commit e882ee7056f370e0619d137b4ec3973ecb4e3479
 Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Wed Jul 16 01:57:00 2008 +0300
+Date:   Tue Jul 29 17:52:11 2008 +0300
 
-    strcasecmp: Actually use the right license
+    EXA: Remove unnecessary #includes
     
-    Forgot to update the license when I committed the FreeBSD version, so it
-    still had an old SGI license.  Sorry.  Sorry.
-    (cherry picked from dcf6293030126509d7d6c61d131222037d5ed7db commit)
+    There wasn't actually any font code here, so no problem.
 
-commit 5a5030af9b8c7a801f07c82feaf3d2eaf4784db3
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Wed Jun 11 15:09:46 2008 +0300
+commit 6c1bb64c6f2efd81856ca00591df37916713b142
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 4 15:19:45 2008 +0930
 
-    DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
-    
-    Add strncasecmp (as we're now using it) in case someone doesn't have it,
-    and also change strncasecmp args to be const, in accordance with
-    everything else.
-    (cherry picked from 11f9e3520249a603b95e64503ee759998ff17feb commit)
+    xkb: break up XkbCopyKeymap into bite-sized chunks.
 
-commit f7ee776de29b1cc23a3fd894a559c7d27ddd62af
+commit 3c6a9c531f673b7a0cb9ca01860b4dbe79686363
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 15:52:07 2008 +0930
 
     config: protect against potential out-of-bounds indexing.
-    (cherry picked from commit 3c6a9c531f673b7a0cb9ca01860b4dbe79686363)
 
-commit 7d508f783c715d633df4f7f924523bd4e1724e08
+commit 92c51b183c2ff06361dad7f918daed6577ba4935
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Aug 1 14:24:54 2008 +0930
 
     config: support type strlist for XkbOptions property.
     
     For backwards compatibility with server 1.4.
-    (cherry picked from commit 92c51b183c2ff06361dad7f918daed6577ba4935)
 
-commit 2f6b270e48ec7b9eb9ff8f98281308f50c081b63
+commit 35b14519b4a3158592a089170ec039bbc219603e
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Tue Jul 29 12:59:57 2008 +0930
 
     config: add parsing for input.x11_options.XkbOptions. #16874
     
     X.Org Bug 16874 <http://bugs.freedesktop.org/show_bug.cgi?id=16784>
-    (cherry picked from commit 35b14519b4a3158592a089170ec039bbc219603e)
 
-commit 0788adb9a68af83614ee9d0758f30fa471feded8
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Wed Jul 16 03:00:25 2008 +0300
+commit d762c08aebe3b7e8c88e2e7a6fcf66057a21b403
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Mon Jul 28 14:07:48 2008 +0200
 
-    HAL: Remove grotesque open-coded strcasestr
+    dix: export driver-side functions for acceleration
     
-    Not only was this pretty ugly, but it didn't even work on systems
-    without strcasestr anyway, due to the define not being in dix-config.h.
-    Lack of strcasestr is handled transparently with the version from
-    FreeBSD now anyway, so, huzzah.
-    (cherry picked from commit b8dd07f855c555af56cbf0f69df799f424da2cca)
+    also add additional safety for accel driver api
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit db918ea2b0d6d03688cef9d6b8d318774b9efec2
+commit 18e9fd69fe01298d825b46415b9c6bd86c75dfe5
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Tue Jul 29 10:07:43 2008 +0200
+
+    dix: use average of pointer accel profile
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 25882af6d3359e5ae42c927c555f5b257ba5665c
+Author: Ivaylo Boyadzhiev <iboyadzhiev@nvidia.com>
+Date:   Sun Aug 3 18:55:12 2008 -0700
+
+    Fix a longstanding XAA CopyPlane bug.
+    
+    TmpBitPlane is a plane mask, not a plane index.
+    
+    Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit d980913f3145cdc34baab27ff818c9631c4c8571
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Aug 1 16:15:04 2008 -0400
+
+    Erk.  Actually check all the BARs, not just the first.
+
+commit 82d51e6df2bf677bdf24376092bcaa79b534f6e5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Aug 1 13:17:55 2008 -0400
+
+    Silence the "No matching Device section" warning in some harmless cases.
+    
+    If the device doesn't have any BARs then it's just a stub for some
+    lame operating systems that need one PCI device per output for
+    multihead.  No point in warning about it.
+
+commit 9643e8d3482a35d355a243db7aa397ad47f29be0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Aug 1 11:35:47 2008 -0400
+
+    Handle XGI cards in autoconfig.
+    
+    It's all a bit wonky since both sis(4) and xgi(4) claim to support the
+    Volari Z7 and V5/8 (0x0020 and 0x0040), so let's side with xgi(4), why
+    not.  Note that the V3 (not V3XT) identifies itself as a trident chip.
+
+commit 63bdd4c27d47323b3282bf0b6eaecae91c79b45c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 31 17:31:36 2008 -0400
+
+    Unifdef XIDLE.
+    
+    Seriously how was this still here.
+
+commit 8d214bc26f9b7ab6a5c54d7749cd4b6811cb0b96
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 31 15:46:52 2008 -0400
+
+    Document more of the OS and library assumptions.
+
+commit 2198e237b2ed85857c671eee2cd04dfc032befee
+Author: Tomas Carnecky <tom@dbservice.com>
+Date:   Thu Jul 31 13:46:06 2008 -0400
+
+    Cosmetic cleanup to Xvfb/Xdmx configure check output.
+
+commit 148175fb8b365dcf00b13539b3f03ce33f3df707
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Thu Jul 31 16:54:33 2008 +0200
+
+    EXA: Do still return FALSE if the driver PrepareCopy hook failed...
+    
+    Thanks to Stuart Bennett for pointing out the problem on IRC.
+
+commit 68fd6604a15b653d1fa244633eaaee9608a03ab3
+Author: Tomas Carnecky <tom@dbservice.com>
+Date:   Thu Jul 31 10:03:56 2008 -0400
+
+    OutputPropertyNotifyMask is a valid thing to select for.
+
+commit 64ebeeb5265a4c425b9397fdc86a6d81521a856e
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Thu Jul 31 10:58:52 2008 +0200
+
+    EXA: Fix exponential growth logic for GXcopy tiled fills.
+    
+    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16908 .
+
+commit 8405c25d9ddbfddb6b155a436f07ccad689e53bd
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Thu Jul 31 10:55:44 2008 +0200
+
+    EXA: Simplify exaFillRegionTiled() control flow.
+    
+    Also only call REGION_TRANSLATE() when necessary.
+
+commit b37b1e66996f8335dafc97b12d25aaec452b931e
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed Jul 30 18:48:27 2008 -0700
+
+    Make shmint.h part of the SDK.
+    
+    This includes ShmRegisterFuncs, ShmSetPixmapFormat, fbShmPutImage, and
+    ShmRegisterFbFuncs.  Note that fbShmPutImage was already exported.
+
+commit a3afa6f2fb80489f7b6a88d12def09281d32ed94
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Wed Jul 30 18:30:37 2008 +0200
+
+    EXA: Optimize GXcopy tiled fills.
+
+commit 37087bc10630ee7740df1369b3e56a44fd2ad2b0
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Wed Jul 30 18:27:33 2008 +0200
+
+    EXA: Replace open coded CopyArea logic with GC op call.
+
+commit bb2cacd33eb85f39b9e7fa554545611957df677d
+Author: Xavier Bestel <xavier.bestel@free.fr>
+Date:   Tue Jul 29 13:06:10 2008 -0400
+
+    Cosmetic fix to EDID decoding.
+
+commit a70754a9fdb019d85fbfca1898699f3c6f609fdd
+Author: Alan Hourihane <alanh@tungstengraphics.com>
+Date:   Tue Jul 29 14:16:25 2008 +0100
+
+    require inputproto 1.9.99.3
+
+commit 591ef3c047ab3597fef9d687205e99c254ff2040
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 29 10:00:01 2008 +0930
+
+    Xi: ChangeDeviceControl presence events should set the appropriate devchange.
+    
+    Requires inputproto 1.4.4 or higher.
+
+commit 25dd5ce0770c5ff91a79c12223fd4af52759900b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Jul 28 12:33:58 2008 -0400
+
+    Add atKeynames.h in hw/dmx/input and drop evil cross-ddx #include.
+
+commit e39a16aa58456aaecee54edc64f189c958db0902
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sat Jul 26 16:35:19 2008 +0200
+
+    xfree86: don't output a spurious newline to the log when loading a module
+
+commit 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Sat Jul 26 15:35:42 2008 +0200
 
@@ -779,26 +9060,123 @@ Date:   Sat Jul 26 15:35:42 2008 +0200
     
     If xorg.conf has no ServerLayout section, use the first mouse and
     keyboard sections as core devices, even with AllowEmptyInput.
-    (cherry picked from commit 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d)
 
-commit b6024da70404fe1879f1de079e69611fea45a40e
+commit 805f28e96ceb20bc53792ae3cf17f9c26564ae0e
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 12:10:52 2008 +0200
+
+    some trivial changes regarding C compat, indentation, etc.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3209bd21d00b8673d321f70afb65720588ddacb3
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 12:06:34 2008 +0200
+
+    xfree86: perform pointer accel scheme selection by name, not number
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a17cb29f5acdfcdeac929d8c6be3600d44d038ef
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 12:03:17 2008 +0200
+
+    dix: preparation change: make runtime exchange of filter chain safe
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1a9f9ac50f2b0db735789905cc29572a50c8ae4c
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 11:49:36 2008 +0200
+
+    dix: optimize precision in device velocity estimation
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c184b91d9aa72031c2bac9f379f56633957ded30
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 11:33:25 2008 +0200
+
+    dix: improve the driver interface to predictable pointer acceleration
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 87aa5298576ed335ac31347e14fb30430288157a
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 11:28:09 2008 +0200
+
+    dix: introduce defines for accel profile numbers
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4e32e6fb38d19c9993de86188e4f7e7916a028e2
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 11:10:22 2008 +0200
+
+    dix: rename classic accel _scheme_ to lightweight to avoid confusion with
+    classic accel _profile_
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d40183c665d458ac0a6e7952fbe986776a17fda7
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Wed Jul 23 09:28:06 2008 +0200
+
+    dix: add legal statements to ptrvelo.{c|h}
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ec10eccd56be8b947cd63cae0687b8319857fe60
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Jul 28 09:33:04 2008 +0200
+
+    GLX: Unreference drawables bound to the old context, not the new one.
+    
+    Apart from the obvious reference counting issue, this fixes
+    http://bugs.freedesktop.org/show_bug.cgi?id=16867 .
+
+commit 6ab8d6010adfd5ad6f1e1094a26c84f0aff934b1
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Jul 28 09:32:59 2008 +0200
+
+    AIGLX/DRI1: Pay more attention to return value from DRIGetDrawableInfo().
+    
+    Could have crashed otherwise if the num(Back)ClipRects variables referenced by
+    the caller weren't pre-initialized to 0.
+
+commit b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Jul 28 09:32:54 2008 +0200
+
+    Fix Makefile.am crack.
+    
+    Looks like an artifact from early modularization.
+
+commit 3575d9584edf35ec1720bc3755b6576a56613685
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Tue Jul 29 10:00:01 2008 +0930
+Date:   Fri Jul 25 16:46:44 2008 +0930
 
-    Xi: ChangeDeviceControl presence events should set the appropriate devchange.
+    config: note that HAL options must be strings.
     
-    Requires inputproto 1.4.4 or higher.
-    (cherry picked from commit 591ef3c047ab3597fef9d687205e99c254ff2040)
+    Only strings are parsed by the server, all others are ignored. Doesn't matter,
+    specifying int options as strings works fine anyway.
 
-commit da29a25315b5dc0df4f6e221cf81587efffce4c6
+commit 54651ff5ec54f4c621e060b19f31d77d519ef158
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Tue Jul 29 10:04:24 2008 +0930
+Date:   Thu Jul 24 17:41:48 2008 +0930
 
-    Require inputproto 1.4.4
+    xkb: remove superfluous inputInfo.keyboard treatment.
     
-    for DeviceControlChanged define.
+    Really not necessary, we can just walk the list and spare us the special
+    treatment of the VCK.
+
+commit 70bd8261223366dae9dfdbb999691328d85f093c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jul 24 17:38:16 2008 +0930
+
+    xkb: use PickPointer/PickKeyboard in _XkbLookupAnyDevice.
 
-commit d199d800a41f8a6ba044c3f8a3777dec7881e89a
+commit 47160edec7f0d9129576d83f1593a5549879a893
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Jul 24 12:12:45 2008 +0930
 
@@ -811,44 +9189,269 @@ Date:   Thu Jul 24 12:12:45 2008 +0930
     mouse/keyboard sections if none where referenced. Now, with HAL and AEI
     enabled by default, setups that relied on this auto-adding break and are left
     without input devices. The least we can do is warn them.
-    (cherry picked from commit 47160edec7f0d9129576d83f1593a5549879a893)
 
-commit 538942cc65b5a112739fb94e57b3be963cf50873
+commit f30b0823dbfc5902e54b337b5b6b570ebf216584
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Jul 24 09:56:00 2008 +0930
 
     xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now.
-    (cherry picked from commit f30b0823dbfc5902e54b337b5b6b570ebf216584)
 
-commit 37927b8bfa78670b263311ae1f06d2aae973601d
+commit ad4cd2e241691427689591f7769a1184c8c1c7f5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 23 17:40:28 2008 +0930
+
+    xkb: don't send core events on SlowKeys.
+    
+    Core events don't happen until later in the DIX, so pump device events down
+    instead. This makes modifiers work again when SlowKeys is enabled.
+
+commit 7d9dece74fc2bf130ceb8818ced5d9e3ac526900
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jul 21 22:12:45 2008 +0930
+
+    dix: fix up enter/leave system once again.
+    
+    Two corrections
+    1. the "detail" field has NotifyVirtual, etc., not the "mode" field. This was
+    a clear bug.
+    2. don't set/unset the flags for NotifyGrab or NotifyUngrab. Clients are
+    expected to deal with multiple enter/leave events per window if the mode is
+    not NotifyNormal.
+    
+    Testable with TCL menu boxes (such as used in gitk):
+    tk_optionMenu .menu globVar Val1 Val2 Val3 ValJunk
+    pack .menu
+    
+    Thanks to Michel Dänzer for pointing this out.
+
+commit 2ce434f54bc0d6050ef115e310df62c035e84bf2
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Jul 24 18:44:16 2008 -0400
+
+    Clean up unused definitions from glx headers.
+
+commit ae67508392261ae47858692668a0c192ef4a9d7b
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Fri Jul 25 10:05:30 2008 -0400
+
+    Fix AddExtension now that CloseDownProc can be NULL.
+
+commit eff25430b4a391409e39337962ff7697165d23c7
+Author: Daniel Drake <dsd@laptop.org>
+Date:   Thu Jul 24 21:06:34 2008 -0500
+
+    Don't abort if swrast library is not present
+    
+    GLX is enabled by default, but the current swrast behaviour causes X
+    to abort with fatal error if the swrast dri library dlopen fails.
+    
+    Handle the case where the swrast library is not present, and do not
+    register the GLX extension unless at least one screen has a usable
+    GL provider.
+
+commit 62b5690415786c4a6e8bac464aa8db578beb74f5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 16:13:10 2008 -0400
+
+    Remove some more MEMBUG garbage.
+
+commit 036822584b26854e2f486f1bea84d8d19d9324de
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Jul 24 16:03:58 2008 -0400
+
+    Drop xf86CommonSpecialKey() and atKeynames.h
+    
+    These are AT scancode specific, should really be part of xf86-input-keyboard.
+    Remove from server, move to xf86-input-keyboard.
+
+commit f3ff2386016ced7e677817e9761a535f0f385813
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 15:28:07 2008 -0400
+
+    Sync is built-in and mandatory.
+
+commit 3fcf4d3eb89fecaa2be7b5ac4933b693c9c3d97e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 15:09:05 2008 -0400
+
+    XC-MISC is built-in and mandatory.
+
+commit 9757106bba8f7bea99c5211817fc6b5fde4e6f66
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 14:59:14 2008 -0400
+
+    Remove all empty extension reset hooks, replace with NULL.
+
+commit 6bcde69585fcc8f8dbfe81c115649f19274922fa
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 09:13:26 2008 -0400
+
+    Allow extension closedown hook to be null.
+
+commit f65c50c4e902c7b5619fb7bbee8462434d809ec7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 09:07:42 2008 -0400
+
+    Bigreqs are built-in and mandatory.
+
+commit d6228cb22aa89b90834d80d98b91862c1fc01b54
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 24 09:00:22 2008 -0400
+
+    Shape extension is built-in and mandatory.
+
+commit 990fc643ae90c034187707e7de414d80640ec6da
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Jul 24 15:02:40 2008 -0400
+
+    Ugh, remove trailing backslash.
+
+commit 806e8cf3c01f955411445a7095f0957ea9a9b22a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Jul 24 14:25:24 2008 -0400
+
+    Remove SPARC muldiv code.  Was used by ELF loader, which is no more.
+
+commit dff1a609bb4c0171e2abb92b54c16e739aec9ca2
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Jul 21 18:29:08 2008 -0400
+
+    Drop the glx resize hook and stop chaining PositionWindow.
+
+commit 24dddcd0ef845f4120f8588dc63ec754338ffac8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Jul 21 18:16:38 2008 -0400
+
+    Drop unnecessary linked list of contexts from GLXDrawable.
+
+commit 5c1e254cc85e9ad409b0217780545c29f62d5feb
 Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Tue Jul 29 02:51:57 2008 +0300
+Date:   Thu Jul 24 03:01:45 2008 +0300
+
+    Remove xorgcfg
+    
+    Us shipping a GUI configuration utility (especially as part of the
+    server!) was pretty pointless.  There was pretty much nothing it could
+    configure which wasn't already runtime adjustable: if you could get a
+    server up with functioning input and output, there wasn't much xorgcfg
+    could do for you.
+    
+    Au revoir.
+
+commit b74927c3844bc2650d95f604fe782d95ade067f1
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 24 02:42:13 2008 +0300
+
+    Remove ioport
+    
+    I don't know why we would possibly be shipping this.
+
+commit 8c0518379089d230060e9ff672ba5eba34198325
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 24 02:40:02 2008 +0300
+
+    Remove kbd_mode
+    
+    We only built this on BSD and Solaris, and if such a tool is generally
+    useful, ship it with the OS.
+
+commit 0d785bd635d135fcd67b4c9c88f5c8217e9b9240
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 13:43:09 2008 -0400
+
+    Unifdef hpux.
+
+commit 5035741fd4cb4918957064a8c9ded9c7c31b4e22
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 13:38:38 2008 -0400
 
-    Revert "Xi: event_{x,y} should refer to the extended device (bug #16289)"
+    Unifdef __osf__
+
+commit bd8bd2c700e6ccac53b47c45766c0a3a08a59344
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 13:36:35 2008 -0400
+
+    Unifdef AIX.
+
+commit 5f5eed7f790db2f0ae0cd0f5c5ee5a312079c0b0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 13:27:24 2008 -0400
+
+    Unifdef DGUX.
+
+commit 856db05b58b71c5ff22af727aba435a8c356abfa
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 13:25:37 2008 -0400
+
+    Unifdef sgi.
+
+commit ab6557fcd4bb4fd580bb1727dc8764f7dfb2cb30
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Wed Jul 23 13:17:33 2008 -0400
+
+    Optimize commit 331cc3f0799a54910a99484264f76569beeee55a
     
-    After discussion with Peter, realised that diverging from 1.3 and 1.4's
-    behaviour was daft and insane.  Sorry.
+    Reorder to minimize comparisons
+
+commit b699364b1c807d29666633523f5b5a608a07a8ee
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 11:43:59 2008 -0400
+
+    Unifdef VXWORKS.
+
+commit 2e3c43d306616f8accdeaffec9c108ba88324805
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 11:35:06 2008 -0400
+
+    Assume __GNUC__ >= 3.
     
-    This reverts commit 8259d19f7155d82197ecc2aa16b316376c2dcb12.
+    gcc 3.0 was seven years ago.  Get with the times.
 
-commit c0c73e9236cffece7c8049515b03facb41f12f0e
+commit 0c1c9d75089aac0cf673820db83801d3cab5bfc7
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Jul 23 14:16:47 2008 -0400
+Date:   Wed Jul 23 09:11:40 2008 -0400
 
-    xserver 1.4.99.906
+    Remove some broken debugging scaffolding.
+
+commit 0ff5bc404842f7264a8e77f9e2a0bd8d0b051356
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 23 09:09:11 2008 -0400
+
+    Unifdef QNX.
+    
+    Again, hasn't worked since at least 7.0.
+
+commit 331cc3f0799a54910a99484264f76569beeee55a
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Wed Jul 23 00:01:43 2008 -0400
+
+    Fix LookupColor
+    
+    Using strncasecmp(3) with the lenght of the user-supplied colour name
+    will result in a false positive when the db key starts out with the
+    same string.
+    
+    Eg, blue will also match BlueViolet (aka blue violet).
     
-    You know, Mesa 7.1 could release any day now and that'd be just fine.
+    Since the shorter strings occur first in the database, avoid such
+    errors by treating a 0 result from strncasecmp(3) as a positive result
+    when the key’s length is longer than the supplied string’s.
 
-commit e909a396194e64119d04fc6ecb68ddc4265a3e49
+commit bc3c03a3f3c091026310f0e8d55321cec570a0c5
 Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
 Date:   Tue Jul 22 17:34:37 2008 -0700
 
     Don't return BadAlloc when trying to set a PictureFilter with no parameters when a filter with parameters was previously set.
     
     Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-    (cherry picked from commit bc3c03a3f3c091026310f0e8d55321cec570a0c5)
 
-commit c217cb96dccb39ffd689086b6d833a1963dfb661
+commit 92fdd01d8e46dd4b41338754e1a34e9d3c387d4a
+Author: Dodji Seketeli <dodji@seketeli.org>
+Date:   Wed Jul 23 01:07:29 2008 +0200
+
+    [Xephyr] various X86_64 build cleanups
+
+commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b
 Author: Dodji Seketeli <dodji@seketeli.org>
 Date:   Wed Jul 23 01:00:26 2008 +0200
 
@@ -856,134 +9459,544 @@ Date:   Wed Jul 23 01:00:26 2008 +0200
     
     Make sure the _XSERVER64 macro is not defined in Xlib client code.
     That macro is meant to be define only on pure server code, when necessary.
-    (cherry picked from commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b)
 
-commit 14a033f0321b3869f0cbedd344bc0f71738fd052
-Author: Roland Scheidegger <sroland@tungstengraphics.com>
-Date:   Tue Jun 10 15:40:48 2008 +0200
+commit d692e1a63e4718d3b6d486582c19f30259b813a7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jul 22 10:21:22 2008 -0400
 
-    glx: copy msaa visual capabilities
-    (cherry picked from commit 49751fee3b82ebc4917bfb168ec78aad7874f1f1)
+    Build fix.
 
-commit ff1a9b7fea2cfe00bc02a99b919fa1178d4f0b12
+commit d8937ce58137ad675f1ead8f2345eaed0ca63c8a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jul 22 16:52:50 2008 +0300
+
+    autogen.sh: Pass --force to autoreconf
+    
+    Ensure we get all files installed when running autoreconf by passing
+    --force to overwrite previously-generated ones, which fixes running it
+    from tarballs.
+    
+    Also revert Peter's local changes to pass arguments to configure, all of
+    which are the default now anyway, AIUI.
+
+commit 880625eef5d8b168df3e42836fa1b763c51a91b5
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Jul 23 16:53:59 2008 +0930
+Date:   Tue Jul 22 14:34:28 2008 +0930
+
+    xfree86: plug memory leak, free driver's private data when deleting the device.
 
-    xkb: don't send core events for extension devices on SlowKey timeout.
+commit 67d7821ae783d3f123b6ba7203abf847374a1e36
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Jul 21 11:48:24 2008 -0700
+
+    dix: reset potential lastSlaves when disabling an SD
     
-    RedHat Bug 448604 <https://bugzilla.redhat.com/show_bug.cgi?id=448604>
+    Unplug a mouse, then warp the pointer and the warp pointer code will try
+    to update the position of the last slave device associated with the
+    master. That pointer will be stale and the X server will crash.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8c8c4fdf34bfc9d54ebea99fb0af14cad167b4a0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Jul 21 16:39:43 2008 -0400
+
+    EDID: Various reduced blanking fixes.
+    
+    - Use a single common function to compute reducedness.
+    - Call it from both the old-school and new-school mode validation paths.
+    - Define monitor reduced-blanking support in accord with EDID 1.4.
+    - Attempt to filter RB DMT modes away from the "standard" EDID pool if
+      the monitor doesn't claim RB support.
+
+commit e8cd77e14d3fa40e5cf1174acaf925362b2e0a11
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Jul 21 16:15:03 2008 -0400
+
+    EDID: For standard timing blocks, prefer DMT timings if they exist.
+
+commit 6ba70091e2325f534a37ef185fea568d2c43edec
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Jul 21 15:40:34 2008 -0400
+
+    EDID: Correct DDCEstablishedModes to conform to DMT.
 
-commit 2d6022bd4001190df97b5320dccb306a78d7ca21
+commit facb255fa9267e343cbc91f841f1b64e5dc99e98
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Mon Jul 21 16:05:53 2008 -0400
 
     Need to unref pixmaps backing pbuffers too.
-    (cherry picked from commit facb255fa9267e343cbc91f841f1b64e5dc99e98)
 
-commit e4cfdc07f4ef2e42762f0296936bbe776b4b7fbe
+commit d5ae85b5b722821499d5796cf0973ecb6ec125f1
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Mon Jul 21 15:28:50 2008 -0400
 
     Fix embarrasing GLXPixmap leak.
-    (cherry picked from commit d5ae85b5b722821499d5796cf0973ecb6ec125f1)
 
-commit ceffece78b828c30a144affa437cd5ae2021a342
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Fri Jun 20 23:49:32 2008 -0400
+commit c74ddc87c995c73109827717a49f14846c7c4024
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Jul 21 15:10:20 2008 -0400
 
-    Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
-    (cherry picked from commit 95d4ede538fbb68049ba3efa0acb0e9712e5cb01)
+    EDID: Add quirk to clamp max pixel clock to single DVI link speed.
+    
+    On some panels you end up with all of:
+    - No range descriptor
+    - No description of physical connectivity
+    - Native panel size mode in standard timings list
+    
+    In principle you're supposed to use the timings for that mode from the DMT
+    spec, but in practice the DMT spec has timings for both 1920x1200 normal
+    and 1920x1200RB, and the standard timing field gives you no way to
+    distinguish.  And, of course, the non-RB timings don't fit in a single
+    DVI link.
 
-commit 7f542ab37fe0795fa04ea647b0ff3b9b886758f6
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Fri Jul 4 07:29:32 2008 +1000
+commit 55803473adb0a0975fea81035402bf6b4ec0e30b
+Author: Alan Hourihane <alanh@tungstengraphics.com>
+Date:   Mon Jul 21 10:32:57 2008 +0100
 
-    modes: fix initial xorg.conf mode selection.
+    Bump inputproto to 1.9.99.2 for XI_PROP_ENABLED
+
+commit 69de40ee45a6e046be79b735cd1540f63b87aee9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jul 21 17:05:04 2008 +0930
+
+    dix: shift the duplicate button mapping check to ProcSetPointerMapping.
     
-    This was all kinds of broken, we ignored user preferred modes for multiple
-    monitors and also for side-by-side configurations.
-    (cherry picked from commit 0b9ef835a0fe900c121b84e43989591e58ab1126)
+    XI 2 allows two buttons to have the same button code.
 
-commit 0baf677da6a724c2d8de46530622e1a186fa749e
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Mon Jun 2 11:04:41 2008 +0930
+commit 0dbfe0ebc69c307c0626ba824de15d03de1251d4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Mon Jul 21 03:50:15 2008 +0300
 
-    kdrive: don't post motion event if there was no motion. #16179
+    Revert "Try nvidia before nv under the assumption that people who install it usually want to *use* it, too."
     
-    Based on the patch by Tomas Janousek. Backported version.
+    Per mailing list discussion.
     
-    X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
-    (cherry picked from commit 26e7e69ab893d1f2b35213250ada40ec90944f62)
+    This reverts commit 66fb253082ea42179180303393e48846208987fa.
 
-commit a75cbabc25d67b6e03a0f8e5be82ae5ac3887096
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Thu Jul 17 08:40:54 2008 +0930
+commit 6b5206e7cb8e5279816b48f014d47d3f03f16972
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jul 18 15:38:10 2008 +0300
 
-    Revert "kdrive: don't post motion event if there was no motion. #16179"
+    dix: Remove insane BC hacks
     
-    Just because it compiles on my machine doesn't make it right. Needs backported
-    patch from http://bugs.freedesktop.org/show_bug.cgi?id=16179.
+    If your DDX needs a 1bpp mode and doesn't set it up, your DDX is
+    incompetent.
+
+commit 66fb253082ea42179180303393e48846208987fa
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Jul 8 02:39:00 2008 -0700
+
+    Try nvidia before nv under the assumption that people who install it usually want to *use* it, too.
+
+commit 376620460ec50cb98a1e3746629b7f73c2e926d7
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Jul 20 16:53:01 2008 +0200
+
+    Drop some more configure-generated files from the tarball
+
+commit 35346a42271dfe65fe0a86dc522701028bf6daf6
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Jul 20 16:40:59 2008 +0200
+
+    Don't put xf86Build.h in the tarball (bug#9277)
     
-    This reverts commit a08ea64ded83f3781df769eec074d563b03a718f.
+    This file is generated by configure, we don't need to ship a stale
+    version in the tarball.
+    X.Org bug#9277 <https://bugs.freedesktop.org/show_bug.cgi?id=9277>
 
-commit a08ea64ded83f3781df769eec074d563b03a718f
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Mon Jun 2 11:04:41 2008 +0930
+commit 43c6d5a6f83dfdf8596c8d0faf8ac1a64f73a8c1
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Jul 20 16:30:24 2008 +0200
 
-    kdrive: don't post motion event if there was no motion. #16179
+    distcheck fixes
     
-    Based on the patch by Tomas Janousek.
+    Still seems to fail because hw/xquartz has too long filenames
+
+commit 92b0a04ffd630a89705fc73d587182a62c34cd84
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Jul 19 18:21:37 2008 -0400
+
+    Fix compile failure
     
-    X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
-    (cherry picked from commit 26e7e69ab893d1f2b35213250ada40ec90944f62)
+    This fixes a compile failure by ensuring that mouse-cfg.c
+    can see the MTYPE_ constants.
 
-commit 45f274415d8f7dfc18f395783cd7c5dbd4a43c4f
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Thu Apr 24 13:30:28 2008 +0930
+commit 0b45ba488d8a3e901b83e445d17e7e9a67047b6c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Jul 18 10:54:10 2008 -0400
 
-    Xi: don't attempt to send to a NULL window.
+    Drop the FONTCACHE extension.
     
-    Only applicable when the server comes down/restarts. In this case,
-    WindowTable[i] may be NULL. Let's not try to send an event then.
-    (cherry picked from commit f377141912594f87144d6d7f7fdd279a101d8e6c)
+    This appears to have been dead code since X-TT was merged.
 
-commit 476de585bee851ea592af043652aa7525bc8d3ce
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Thu Apr 24 13:29:46 2008 +0930
+commit b85392e66b4cbfcc95897ac342f19ac8ab04d4cc
+Author: Søren Sandmann <sandmann@redhat.com>
+Date:   Thu Jul 17 23:10:11 2008 -0400
 
-    dix: NULL out WindowTable after freeing all the windows.
+    Give priority to clients that are receiving expose and configure events
+
+commit 3b687ffe1649449b3d182f5e7690274c6c96916a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jul 17 18:16:59 2008 -0700
+
+    Make xstrcasestr prototype return value match the implementation
+
+commit f7bfa4ae971b43c3ed81cc84e6d1e071c413f04c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 23:03:57 2008 +0300
+
+    configure.ac: Remove non-existant directory
     
-    CloseDownDevices() tries to send PresenceNotify events. If the windows are
-    already freed, then we are accessing dangling pointers.
-    (cherry picked from commit aec485f2dcc87b340759d67b60e7dee7931aaec5)
+    Oops.
 
-commit 5cb38a3fcabb1b46fc24584f5e42d28a9a2dc703
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Wed Apr 23 11:38:08 2008 +0930
+commit 16e40ecf43ea7df349e54f757db0223764d752ee
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 22:37:31 2008 +0300
 
-    xfree86: don't free the config-file related information in DIDR. #15645
+    Remove dead code, useless #defines, et al
+
+commit b0a99fb02bb7290266d7dddee4de0b9959fb3c52
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 21:42:17 2008 +0300
+
+    configure.ac: Fix release date
     
-    In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
-    xf86ConfigLayout.input) alone for devices that were specified in the
-    ServerLayout section of the config file. This way, in the next server
-    generation we are left with what was the original config and can thus re-init
-    the devices.
+    Instead of putting something that's always wrong, at least just put
+    unreleased, which will be more obviously wrong if it's, well, in a
+    release.
+
+commit 711720650cc192022f0d91f5cf94292d48dbc891
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 21:39:46 2008 +0300
+
+    Everyone has urandom
     
-    This is an addon to 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae, an attempt to
-    fix Bug 14418.
+    If you don't have urandom, please just add a fallback to /dev/random,
+    rather than building our own random generator.
+
+commit 446fe9eecddd1337f9d5164dd7c301e1ba3dfe32
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 21:37:50 2008 +0300
+
+    Dead code removal
     
-    X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
-    X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
-    (cherry picked from commit 9ab4e2fd8eaa87dbd16835affb1aa54dcb1a619e)
+    Remove a whole bunch of code that was never built, be it entire files or
+    just dead ifdefs.
+
+commit 0564b5454ac101d9e1218767bbbc2c2d9f3e0696
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 20:46:27 2008 +0300
+
+    XFree86: Restore AllowMouseOpenFail usage text
+    
+    This was incorrectly stuck behind the XFree86-Misc define, so got
+    deleted with the rest of misc: restore it unconditionally, as it should
+    be.
+
+commit 6c7c0ffeb71610ee00fc92b32fd2b1cc70383e38
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 20:45:01 2008 +0300
+
+    KDrive: Delete rafts of unused code
+    
+    Most of this stuff was gone with the last real hardware drivers that
+    used it.  Au revoir.
+
+commit ad7a7ae290b05f007062161418c929d9cebeef78
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Jul 17 18:51:05 2008 +0200
+
+    XF86BigFont is disabled by default
+    
+    3c19ec47b434d4ca84db58363cc053cc0b6aa413 did that,
+    but pretended to make it 'auto'.
+
+commit 058100fd19ed33a3100d18a9ca56fdcffac361b2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jul 17 09:35:30 2008 -0700
+
+    Remove more Lynx leftovers
+    
+    A couple #if defined(Lynx) && defined(sun) had become just if defined(sun),
+    resulting in wrong settings for Solaris builds, so they're now just deleted.
+
+commit 47833eef35b20a2eb0a74782edbb0877fd491c4c
+Author: Mathieu Bérard <mathieu.berard@crans.org>
+Date:   Thu Jul 17 11:59:24 2008 -0400
+
+    Drop a bunch of #ifdef Lynx.
+
+commit af2138bfce34a28312b26106eaf9561d96712ee0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 17 10:39:29 2008 -0400
+
+    Nuke some ancient code for commandline-challenged OSes.
+    
+    This appears to have been dead code even in 6.7.
+
+commit b9a0cee026361189dce63b87c738bd1d17e02830
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 17 10:32:35 2008 -0400
+
+    Drop hw/xfree86/os-support/lynxos/
+    
+    This has never worked in any modular release, clearly no one cares.
+
+commit d87f170bd99f7908eb14272ac42c8963d089f54f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 17 10:29:52 2008 -0400
+
+    Remove XF86Misc code from xorgcfg.
+
+commit e3ff8501749209ee2dd324d35ae16e37510e0574
+Author: Jie Luo <clotho67@gmail.com>
+Date:   Thu Jul 17 10:27:24 2008 -0400
+
+    Remove duplicate load of freetype font renderer.
+    
+    libXfont will do this for us in FontFileRegisterFpeFunctions.
+
+commit 8441e26266701776f1416bec864ae2949355da76
+Author: Jie Luo <clotho67@gmail.com>
+Date:   Thu Jul 17 10:23:37 2008 -0400
+
+    Remove freetype from the list of autoloaded modules.
+
+commit 5d11ae7a69e3a7611c667be4628a15a4b514f72c
+Author: Jie Luo <clotho67@gmail.com>
+Date:   Thu Jul 17 10:22:29 2008 -0400
+
+    Fix color lookup.
+    
+    OsStrCaseCmp returned inverted comparison sense from normal strcasecmp.
+
+commit 478d3918d5b23fba1a7e3aaea766dfa785e5a0a6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 17 03:29:26 2008 +0300
+
+    XFree86: Remove remnants of XFree86-Misc
+    
+    HandleMessage: dear god, no.
+
+commit 95000e34df9ba066905430eb0eb39a616567183e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 16 16:37:14 2008 -0400
+
+    Build fixes
+
+commit affec10635343668839994ea2bac16c1d4524200
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 16 14:44:33 2008 -0400
+
+    Remove loadable font renderer support.
+
+commit acc91054316208844742495dea0b80a860ef02bb
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 16 14:24:47 2008 -0400
+
+    Remove font module support from xorgcfg.
+
+commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 16 14:19:04 2008 -0400
+
+    Remove the numVideoScreens xprintism.
+    
+    This was to account for cases where you had video and print screens in
+    the same server.  Lunacy.  Leave the slot in ScreenInfo, but rename it,
+    and stop looking at it.
+
+commit 1a573e402ec112913a404f092b5b97d8d9210f94
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 16 13:41:53 2008 -0400
+
+    Update the Allow*Grabs documentation for xf86misc removal.
+    
+    The API to turn the grab-break keys back off is gone now, so don't
+    say it exists.
+
+commit 55644d2f1cddf1777587f213ed581b6087d9fdad
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 14:23:34 2008 +0300
+
+    Make --enable-debug usable again
+    
+    Enable region debugging causes assertion failures (should really look
+    into that, though), and I don't need four messages every time I move my
+    pointer.
+
+commit 22e64108ec63ba77779891f8df237913ef9ca731
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 06:25:26 2008 +0300
+
+    XFree86: Remove XFree86-Misc extension
+    
+    Its last remaining purpose in life has been destroyed by input
+    properties.  Au revoir: it's been fun, by which I mean awful.
+
+commit b8dd07f855c555af56cbf0f69df799f424da2cca
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 03:00:25 2008 +0300
+
+    HAL: Remove grotesque open-coded strcasestr
+    
+    Not only was this pretty ugly, but it didn't even work on systems
+    without strcasestr anyway, due to the define not being in dix-config.h.
+    Lack of strcasestr is handled transparently with the version from
+    FreeBSD now anyway, so, huzzah.
+
+commit ad87c72edcc0d1f56658e0c4e73af335c8d5a516
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 02:59:51 2008 +0300
+
+    DIX: Add strcasestr from FreeBSD
+    
+    Add strcasestr for use on systems which don't have it.
+
+commit c3c901cf44cf16bb33c4176494361b429099a372
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 02:54:41 2008 +0300
+
+    configure.ac: Fix SHA1 handling
+    
+    Fix and marginally simplify the SHA1 handling.  First, we allow people
+    to override it.  Secondly, we try for libmd.  Then, we try for OpenSSL
+    with pkg-config.  In a last, desperate move, we try libcrypto on its
+    own.  This allows the server to, y'know, _link_ when using OpenSSL,
+    instead of failing because we only have -lcrypto, and not -lssl.
+
+commit 69b57dc651e12a0d9a5a4295b185c62d5c0df63f
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 02:03:36 2008 +0300
+
+    dix: Actually build str(n)casecmp if we don't have it
+    
+    Remember to add stuff to dix-config.h when you add new AC_DEFINES,
+    people ...
+
+commit dcf6293030126509d7d6c61d131222037d5ed7db
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 01:57:00 2008 +0300
+
+    strcasecmp: Actually use the right license
+    
+    Forgot to update the license when I committed the FreeBSD version, so it
+    still had an old SGI license.  Sorry.  Sorry.
+
+commit 441f084bfe87a6ea1c94ec63f82888b8b3d81d89
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 2 19:52:58 2008 +0300
+
+    config: Don't attempt to use D-Bus when not strictly necessary
+    
+    If we have D-Bus but have explicitly disabled it, don't build it.
+
+commit 35c89f3f5b8fa222e37b799d5bb01595e8f30d0c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jul 16 01:43:58 2008 +0300
+
+    XFree86: Remove mysticism from Makefile.am
+    
+    The variables were always the same, so just shove them in with the rest
+    of the plebs.
+
+commit b89a59248a4a0ff06b9a0ddee45881efc6063063
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jun 27 12:20:56 2008 +0300
+
+    XFree86: Delete OSMouse code
+    
+    This should be moved into the mouse driver, if anything.
+
+commit d0de5ea96d084fc5da87d8f323ddfc08fe9c03ba
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jun 25 17:56:28 2008 +0300
+
+    XFree86: Remove useless debugging code
+    
+    Also remove documentation which told you how to use a non-module-aware
+    GDB, albeit only with old, non-shared, modules.
+
+commit 4b1273c9c2da113f634be80caa28e81df3beae98
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jun 25 17:51:12 2008 +0300
+
+    XFree86: Delete empty file & function
+    
+    xf86InitXkb() has been empty for as long as I can remember.
+
+commit 3a54f3f48fa1c0d60604c3ee767c569b5ec23430
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jun 12 01:05:04 2008 +0300
+
+    XFree86: Clean up init a tiny bit (no code changes)
+    
+    Reshuffle and delete.
+
+commit ddcefb50dda9e398647d1c84c7153127ed26a4d2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jun 11 15:14:26 2008 +0300
+
+    XFree86: Remove trailing whitespace
+
+commit e6f35f28fb3526b911101bde4aa761de8b055aef
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jun 11 15:13:21 2008 +0300
+
+    OS/KDrive/XFree86: Sanitise colour initialisation
+    
+    OsInitColors always just returned TRUE, so just remove calls to it and
+    insane special-case logic.  Remove unused kcolor.c implementation, and
+    merge oscolor.h into oscolor.c since it was the only user.  Remove
+    open-coded strncasecmp in oscolor.c.
+    
+    Since we no longer need to call OsInitColors after reading the config
+    file, just call PostConfigInit() from one place, and move PM handling to
+    one place so we can install the signal handlers earlier.
+
+commit 11f9e3520249a603b95e64503ee759998ff17feb
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Jun 11 15:09:46 2008 +0300
+
+    DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
+    
+    Add strncasecmp (as we're now using it) in case someone doesn't have it,
+    and also change strncasecmp args to be const, in accordance with
+    everything else.
+
+commit ae38151ddda9984effca5bb7c582540061201dce
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Mon May 19 08:35:05 2008 +0300
 
-commit 2b3faf2a75a1acc3b799a2868c55736c94a8183f
+    configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
+    
+    This fixes the linking for these two when using DRI2, which requires
+    DLOPEN_LIBS.
+
+commit ccec16e519c143f4c0017a37e93ebc52ac472e4e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jul 15 11:24:08 2008 -0400
+
+    Bug #7300: Move xf86RAC to hw/xfree86/common
+
+commit 9111944b292355f7478b4ae75bead8dc25edbbcb
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Tue Jul 15 10:36:38 2008 -0400
 
     Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.
-    (cherry picked from commit 9111944b292355f7478b4ae75bead8dc25edbbcb)
 
-commit 5b546f1c493785c1f24a4f6c69174b70caa64eb1
+commit 3f3f66de669caf3606eec8c5f8d405a283cbf12d
+Author: Brad Smith <brad@comstyle.com>
+Date:   Mon Jul 14 22:20:41 2008 +0200
+
+    Fix the configure tests for swap16/__swap16 macros on OpenBSD.
+    
+    BSD systems need <sys/types.h> included before <sys/endian.h> for
+    macros to work.
+    <https://bugs.freedesktop.org/show_bug.cgi?id=16531>
+
+commit 11ee0ae9390a608a232ff94abcc0cbcf9ed7b70a
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Mon Jul 14 10:20:11 2008 +0930
 
@@ -996,48 +10009,296 @@ Date:   Mon Jul 14 10:20:11 2008 +0930
     suspend/resume.
     
     RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
-    (cherry picked from commit 11ee0ae9390a608a232ff94abcc0cbcf9ed7b70a)
 
-commit 5659f6d31bc4dd2e79d13f4856cbfa3f120958ff
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Mon Jul 7 13:14:49 2008 +0200
+commit 5bcc45e07e8726a5442567472dd29cfb5c901f2d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sun Jul 13 18:40:53 2008 +0930
 
-    Export xkbfile.h in the SDK
+    Xi: expose Enable/DisableDevice through XI_PROP_ENABLED property.
+
+commit c9eb0e870c87d291311491452adf7f91a911e24b
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Thu Jul 10 22:33:39 2008 +0930
+
+    Add support for multiple pointer acceleration schemes. #8583
     
-    It's needed by xkbsrv.h
-    (cherry picked from commit d8af9d9ab1cd98c07fdf42490dcc0cab3c655b89)
+    Available acceleration schemes:
+     - xorg classic scheme.
+     - the new "Predictable" polynomial accel scheme.
+    
+    X.Org Bug 8583 <http://bugs.freedesktop.org/show_bug.cgi?id=8583>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e7abe1676a6a4e4249504b8c9660cbad70569199
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sun Jul 13 18:41:53 2008 +0930
+
+    Xi: protect against NULL handlers, don't try to dereference.
+
+commit 2bbb12c355308d10bf123911044fbdf6ae7fb59c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sun Jul 13 20:23:14 2008 +0930
+
+    Xi: remove ChangeDeviceControl for CoreCtl.
+    
+    If you want to set a device to core, attach it to a master device.
 
-commit e135a77b8bad15fb135cd080c1725064f938b790
+commit 18ff17756c988b6c21b76bf898e45685649d07bb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jul 10 19:23:14 2008 +0930
+
+    Xi: GetDeviceProperty reply includes deviceid.
+
+commit c3267106fb599213555829cb76df7848c4ebe23b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jul 9 10:02:41 2008 -0700
+
+    XQuartz: Use CFEqual to compare keyboards
+    (cherry picked from commit 5538e43b9ae7d06d2f48842b065810ce74286eb6)
+
+commit 90dd2de845ae12153296f6f1bff0c87f79c57854
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Jul 7 10:55:58 2008 -0700
+
+    XQuartz: Some fd handoff cleanup.
+    (cherry picked from commit 9c20a4804d97e67a988f00f49866997209cce518)
+
+commit 26d8030c3836816de8c12b2cb9d67315e5c887eb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Jul 4 19:23:21 2008 -0700
+
+    XQuartz: Remove deprecated keyboard code.
+    (cherry picked from commit 69cfc1a21e12bb38a6130dea2e5f20f1e6a3ee7c)
+
+commit 5cfcbd54d98cc77ee02a3a099ebbad9af511a0ee
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jul 2 00:47:08 2008 -0700
+
+    Set machine dependent defaults for ppc64
+    (cherry picked from commit 0733ef2e8abda99cfd62966e73017949e9cd507f)
+
+commit e69b9f9ca45c0c6bfb93ea9143737116bf1f2453
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 25 11:51:27 2008 -0700
+
+    XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
+    (cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba)
+
+commit 8d2e2e1d856efec4459de2a20af642dc1ec9b8a5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 11 11:44:45 2008 -0700
+
+    Xquartz: Removed include directive for removed header
+    (cherry picked from commit e65a36d57f338410c5a5b02cb5ae1214a81d072d)
+
+commit ebd70c82fdbe483d149ac9bdb5a64cc6e0c10e0a
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Thu Jul 10 14:38:34 2008 -0700
+
+    Add LoaderShouldIgnoreABI to allow drivers that roll their own ABI checks (i.e. nvidia) to perform the check before ScreenInit.
+
+commit c42427f63f0e0495e56909ee99ad1e3c4321c39b
 Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
-Date:   Wed Jul 9 10:44:19 2008 -0300
+Date:   Wed Jul 9 10:50:21 2008 -0300
 
     Fix incorrect test regarding keyboard map.
     
-    In the map stored in each keyboard device, the first line refers to minimum
-    keycode, i.e., the 0th line refers to keycode 8. When not using XKB the wrong
-    test caused some keys to be interpreted as locks ('m' for instance). The had
-    to be pressed twice to generate both KeyPress and KeyRelease events.
+    In the map stored in each keyboard device, the first line refers to
+    minimum keycode, i.e., the 0th line refers to keycode 8. When not
+    using XKB the wrong test caused some keys to be interpreted as
+    locks ('m' for instance). The had to be pressed twice to generate
+    both KeyPress and KeyRelease events.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit c30f36c8c1dfd85deaf1c109823a1f15dd218ac7
-Author: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date:   Thu Jul 3 21:42:10 2008 +0200
+commit e4054e5cb3d919dfc83021be3f2b9036d0e5a2be
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jul 10 11:03:31 2008 +0930
+
+    Xi: pack the property stuff into a struct, make handlers a linked list.
+    
+    We may need more than one handler to deal with a property (e.g. one in the
+    driver, one in the DIX), so get the handlers into a linked list and call them
+    one-by-one. This is of course slightly less entertaining than the hilarious
+    WRAP/UNWRAP game we play in other parts of the server.
+    
+    XIRegisterPropertyHandler/XIUnregisterPropertyHandler are the interface
+    drivers/the DIX should use to attach themselves to the device.
+    
+    XIDeleteAllDeviceProperties destroys everything, including the handlers.
+
+commit 2039c6ea43244339659323d05d96c14e41996c20
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jul 7 22:10:17 2008 +0930
+
+    Xi: add support for input device properties.
+    
+    Basically just copied from randr properties, with minor changes only.
+    Each device supports arbitrary properties that can be modified by clients.
+    Modifications to the properties are passed to the driver (if applicable) and
+    can then affect the configuration of the device.
+    
+    Note that device properties are limited to a specific device. A property set
+    on a slave device does not migrate to the master.
+
+commit 4ab01fe5db7fb330b1ec463aa49b77859527e597
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jul 10 16:27:36 2008 +0930
+
+    Revert "Xi: add support for input device properties."
+    
+    Note to self: don't mix up branches with half-finished cherrypicks.
+    
+    This reverts commit 666838fcc8b71fdeae160844160187f345cbf4a6.
+
+commit 666838fcc8b71fdeae160844160187f345cbf4a6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jul 7 22:10:17 2008 +0930
+
+    Xi: add support for input device properties.
+    
+    Basically just copied from randr properties, with minor changes only.
+    Each device supports arbitrary properties that can be modified by clients.
+    Modifications to the properties are passed to the driver (if applicable) and
+    can then affect the configuration of the device.
+    
+    Note that device properties are limited to a specific device. A property set
+    on a slave device does not migrate to the master.
+
+commit acce27093571497a0626cee1cdb61ddf751dbc40
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 8 16:02:13 2008 +0930
+
+    Xext: store the GenericMasks in the resource system.
+    
+    This fixes a severe issue - when the client died the event mask didn't get
+    unregistered and a future event would dereference dangling pointers. By
+    storing the event masks in the resource system we can free them when the
+    client dies.
+
+commit db86b8839f286e0e2efb5638b8ab2fe608707655
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 8 15:12:45 2008 +0930
+
+    dix: free GenericMask allocations when destroying window.
+
+commit 08e2c625f620688d35f3b443ffb878e8e991ff57
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jul 9 20:07:59 2008 -0700
+
+    Remove README.font, since it's just an old text copy of xorg-docs/sgml/fonts
+
+commit 5e847c1d4fc30a0d263a861a76982660f11998cd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jul 7 17:08:01 2008 -0700
+
+    Improved driver selection when autoconfiguring driver without xorg.conf
+    
+    - Allow returning multiple drivers to try for a given PCI id (for instance,
+      try "geode" then "amd" for AMD Geode hardware)
+    - On Solaris, use VIS_GETIDENTIFIER ioctl as well as PCI id to choose drivers
+    - Use wsfb instead of fbdev as a fallback on non-Linux SPARC platforms
+
+commit 235fea0e1a2101fb76a54e6505db321674530c60
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jul 7 15:21:59 2008 -0700
+
+    Update bsd & solaris descriptions in README.OS-lib
+
+commit d8af9d9ab1cd98c07fdf42490dcc0cab3c655b89
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Mon Jul 7 13:14:49 2008 +0200
+
+    Export xkbfile.h in the SDK
+    
+    It's needed by xkbsrv.h
+
+commit d78bebb20a00e8519788c75c90b467a5750c78be
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jul 4 04:04:19 2008 -0300
+
+    Remove unused function and variables.
+
+commit a8c4727f01949da0ae266369f0d12a96c2bf0da5
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jul 4 04:03:46 2008 -0300
+
+    Fix typo in the last commit.
+
+commit 3164288b121990a5990747c0f92d4af13b1c929a
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jul 4 03:55:59 2008 -0300
+
+    Remove deprecated function miPointerPosition().
+
+commit d1031a8972490ebf0ef6dc2762036a7a7172466b
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jul 4 03:46:21 2008 -0300
+
+    Update README.OS-lib to reflect reality.
+
+commit f72500c4a09cce5dbbd16639b1951a4bf943e4ac
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jul 4 03:45:18 2008 -0300
+
+    Nuke libc wrapper remaining stuffs.
+
+commit 3fd5fab5663fbdce2fc0b5377155aedf9a70b6c2
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jul 4 02:51:42 2008 -0300
+
+    Remove inexistent function headers.
+
+commit 0b9ef835a0fe900c121b84e43989591e58ab1126
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jul 4 07:29:32 2008 +1000
+
+    modes: fix initial xorg.conf mode selection.
+    
+    This was all kinds of broken, we ignored user preferred modes for multiple
+    monitors and also for side-by-side configurations.
+
+commit e317943c125d7fdbe62c750324640eb30c88fa15
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 2 12:23:03 2008 +0930
 
     xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
     
     Remove AEI check from configImpliedLayout as the setting isn't actually parsed
-    at this point anyway.
+    at this point anyway (written by Sasha Hlusiak).
+    
+    Resurrect checkInput() and check for devices there if AEI is false (this also
+    creates the default devices if required).
     
     Set AllowEmptyInput to enabled by default if hotplugging is enabled.
 
-commit 5144158ced1c03fcd0df080e42436523c6ac5e8f
+commit fe5cf7cb00fd926cefff933adbdbceea7353f4c2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 1 13:18:54 2008 +0930
+
+    xfree86: handle missing Screen lines in the ServerLayout #16301
+    
+    If no Screen is specified in the ServerLayout section, either take the first
+    one from the config file or autogenerate a default screen.
+    
+    X.Org Bug 16301 <http://bugs.freedesktop.org/show_bug.cgi?id=16301>
+
+commit 6674b87a7dca7d6ffd9dd9af888c5256b13d7877
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 29 20:05:27 2008 +0930
+
+    xfree86: move declaration of configured_device to start of function.
+    
+    Last I checked C doesn't allow declarations halfway down a block.
+
+commit 1e96782011f0b4ba6ed1d3d3df118964a58d15fd
 Author: Dave Airlie <airlied@linux.ie>
 Date:   Thu Jul 3 20:00:22 2008 +1000
 
     dri2: bump libdrm numbers as 2.3.1 is released without ttm interface
 
-commit 793ff6754e9ff16714a2dd9fa5ae83d7189d316e
+commit 1771edcb44b564f83f509748b4e4cd5b7586e2a8
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Thu Jul 3 18:57:09 2008 +1000
 
@@ -1045,44 +10306,57 @@ Date:   Thu Jul 3 18:57:09 2008 +1000
     
     this fixes a crash I was getting on radeon rotate when gnome is running.
     I'm sure g-s-d was doing something bad, but really not crashing ftw.
-    (cherry picked from commit 1771edcb44b564f83f509748b4e4cd5b7586e2a8)
 
-commit e9f83740e3269a7e73c417b5b6c67668f1cac6e0
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Mon May 19 11:16:08 2008 +1000
+commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 2 11:25:50 2008 -0400
 
-    cursor: don't dereference NULL pointer is devPrivates not yet set.
-    
-    This fixes a bug on server recycle with ati zaphod.
+    Fix GLX in Xvfb and kdrive.
 
-commit 8081eda6965e5213e7feca13cbd26aa34e0e0bd8
-Author: Alan Hourihane <alanh@tungstengraphics.com>
-Date:   Wed Jun 18 22:34:02 2008 +0100
+commit 9a73bca859be12721ef62304b1422c455d4aec49
+Author: Chris Ball <cjb@laptop.org>
+Date:   Wed Jul 2 09:46:06 2008 -0400
 
-    Set driverPriv immediately on CreatePixmap.
+    Remove KdOffscreenMarkUsed() as all its callers are gone.
+
+commit b84a27fd9fdcb579437cfa38f10cb12cf55dc7c3
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Wed Jul 2 06:25:03 2008 -0700
+
+    VBO: Regenerate files based on recent changes to gl_API.xml
     
-    If it's NULL anyway, we bail, if not, it lets
-    ModifyPixmapHeader know about the private.
-    (cherry picked from commit 528b4e36ade482df99747081688ae52cfaeb28eb)
+    Since GL_ARB_vertex_buffer_object protocol isn't supported yet, these
+    changes are innocuous.
 
-commit a18551cad1bf88b30d8466859509fb1fcfd1f2d6
+commit 703a9645f3d547144ea62dd81c41f5356a5f87d8
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Jul 2 11:25:50 2008 -0400
+Date:   Tue Jul 1 17:50:48 2008 -0400
 
-    Fix GLX in Xvfb and kdrive.
-    (cherry picked from commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9)
+    Auf wiedersehen, KAA.
 
-commit 81e6ab485163c1ff0a7218313beeb55ee6ea7af9
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Tue Apr 22 23:50:11 2008 +0200
+commit c8216aede6c4ac41976947521d884fa010913204
+Author: Jeremy Uejio <jeremy.uejio@sun.com>
+Date:   Tue Jul 1 13:37:12 2008 -0700
 
-    autoconfig: don't call closedir() when opendir() failed
+    Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
     
-    If opendir() fails, return from matchDriverFromFiles() immediately.
-    Ubuntu bug 217647.
-    (cherry picked from commit fbad87f2ae9f97fcb43546b0fa35f1100415dfec)
+    <http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
+    
+    This bug is caused by Xephyr not handling the RGB byte order correctly
+    of the server where Xephyr is displaying on. The previous code just
+    assumed that the order was RGB and did not take into account that
+    Xservers may use different order (such as BGR).
+    
+    The fix is to add a function to calculate the byte order and bits
+    to shift based on the visual mask and the visual bits_per_rgb (which
+    is usually 8, but could be server dependent).  Since the shifts won't
+    change once the display connection has been made, I can cache these
+    values so that Xephyr doesn't have to keep recalculating them everytime
+    it tries to translate the Xephyr colormap entries for Xephyr clients to
+    the actual server colormap entries (i.e. calling the function
+    hostx_set_cmap_entry() repeatedly for every colormap entry).
 
-commit 75b5e999f045524e2b362e848a0104e1a4217061
+commit 2e8daee05343b2853b677acf4554def0ceeada00
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Mon Jun 30 17:29:35 2008 -0700
 
@@ -1101,299 +10375,271 @@ Date:   Mon Jun 30 17:29:35 2008 -0700
     
     This change works around this problem by ignoring the DIX and querying the real
     size from the driver.
-    (cherry picked from commit 2e8daee05343b2853b677acf4554def0ceeada00)
 
-commit 9ab88bb9b196fdf534f458cce45eb5f301e545e6
+commit e2bbf2d248a2d2a2db4adfe9d1bda94cf184d8bd
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Jul 1 12:01:56 2008 -0400
 
     Don't try to load DRI2 if built without it.
-    (cherry picked from commit e2bbf2d248a2d2a2db4adfe9d1bda94cf184d8bd)
 
-commit ccb373f2fb910db57a3dfcef8a03779f1023470c
-Author: Simon Thum <simon.thum@gmx.de>
-Date:   Mon May 26 17:56:08 2008 +0930
+commit 66d7c9de82b5e733e4995f079a96efe612fca881
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jul 1 10:55:54 2008 -0400
 
-    input: change dxremaind, dyremaind to floats for better acceleration #9156
-    
-    X.Org Bug 9156 <http://bugs.freedesktop.org/show_bug.cgi?id=9156>
+    Declare xf86InterpretEEDID() properly.
+
+commit e4335e876d254e446a965259e845ad955da5b5c2
+Author: root <root@samich.home.cworth.org>
+Date:   Mon Jun 30 15:29:04 2008 -0700
+
+    Revert "XInput ABI is 2.1, not 3.1."
     
-    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+    This reverts commit 76576c87b0de106e006d1cfa59d42d3a483e966c.
+    which was an incorrect revert of previous ABI bumps. Those
+    responsible for the accidental ABI bumps in both directions
+    have all been sacked.
     
-    (cherry picked from commit 0050165a67bb462e0bf644a11644ad9d587c62bb)
+    This allows xf86-input-mouse to build again, for example.
 
-commit 0617653277d2e2802c6223fc2a221adfa6b93fc4
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Jun 30 16:11:32 2008 -0400
+commit 6447f80c17077f924b2d58e07b38d32429edcb9b
+Author: Carl Worth <cworth@samich.home.cworth.org>
+Date:   Mon Jun 30 13:16:49 2008 -0700
 
-    xserver 1.5RC5
+    Use AC_CHECK_LIB before PKG_CHECK_MODULES for openssl
+    
+    Previously, the code was using PKG_CHECK_EXISTS before PKG_CHECK_MODULES,
+    (to cater to OpenBSD systems that include openssl by default but without
+    a .pc file). But this meant that systems that didn't have openssl installed
+    at all would not get any error message at configure time.
+    
+    Now, if the SHA1_Init function is found in -lcrypto without any additional
+    flags, then that's used. Otherwise, pkg-config is used to find the right
+    flags to link against libcrypto. And if that fails, a nice error message
+    is now generated.
 
-commit bee463bd8a991ef7ba619241237cd06d2fc92558
+commit 76576c87b0de106e006d1cfa59d42d3a483e966c
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Jun 30 16:10:37 2008 -0400
 
     XInput ABI is 2.1, not 3.1.
-    (cherry picked from commit 76576c87b0de106e006d1cfa59d42d3a483e966c)
 
-commit 795d293d769aa93dddd457e8e200d62044a3921a
-Author: Keith Packard <keithp@keithp.com>
-Date:   Fri Apr 4 12:11:14 2008 -0700
-
-    Wrap AddTraps in exa and damage.
-    
-    This fine (and unused) function wasn't ever wrapped which made it not work
-    under exa.
-    (cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
-
-commit 32cd2c510939498e94ae2aaec40fe48b2850a321
+commit bed12dd3df0129b7f28d0a42d470266bd3ae6b38
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Jun 30 11:18:27 2008 -0400
+Date:   Sat Jun 21 16:07:54 2008 -0400
 
-    xserver 1.5RC4.
-    
-    Remember kids, distcheck before you tag.
+    Do EEDID in RANDR 1.2.
 
-commit 6ec12077ef0fd712ef97682deab751aac5c39d6d
+commit 4fc18b5fc31aa287e807ee520dc9117296e3d306
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Jun 30 10:47:34 2008 -0400
+Date:   Sat Jun 21 16:07:36 2008 -0400
 
-    Distcheck fixes.
+    Hexdump the whole EDID block if extensions present.
 
-commit 6a2ee7e0bb416e82004510edd97bebe94596a858
+commit b4fbc31e109f1efe78613597f9a91d5363523493
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Jun 30 10:40:50 2008 -0400
+Date:   Sat Jun 21 16:00:05 2008 -0400
 
-    xserver 1.5RC3.
+    Actually fetch all blocks of EEDID if asked to.
 
-commit 6e8ed1398dd68426d45c20c05a10640c22f7d104
+commit 211e2bdcc677122145998829a7f26610c7c567e6
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Jun 30 10:29:17 2008 -0400
 
     Bump ABI minor numbers for the devPrivate ABI functions.
-    (cherry picked from commit 211e2bdcc677122145998829a7f26610c7c567e6)
 
-commit 39cc11b005b2f462bca9004c8e0fa290377687ce
+commit d6b8d9eaffaf3f976db330bc35da3d30eb656bac
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Fri Jun 27 17:16:35 2008 -0700
+
+    DRI: Ensure we have the DRI headers from Mesa
+    
+    Change the DRI configure check to look for the dri pkg-config file. This
+    prevents people who built an Xlib libGL from bombing later in the build.
+
+commit 7ddfb2f1587da3ec1cd27ae270e42700adf4f560
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Jun 26 21:23:31 2008 -0400
 
     Fix a leak of window devPrivates in window.c/CrushTree().
-    (cherry picked from commit 7ddfb2f1587da3ec1cd27ae270e42700adf4f560)
 
-commit 8017c999013b79fd30cb74eaf8ca0970e9b1bd4a
-Author: Dan Nicholson <dbn.lists@gmail.com>
-Date:   Wed May 21 16:14:55 2008 -0700
+commit 15e4b6c57484b6afb790c7dc1db9f529ba2219cf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 24 13:46:40 2008 +0930
 
-    Actually enable building GLX without Mesa source
-    (cherry picked from commit e837244947fbb18192e9056c070ce439ef24d1a3)
+    input: for non-device events (e.g. DevicePresence) use MAX_DEVICES as id.
+    
+    Using id = 0 only worked pre-MPX since XInput didn't allow XOpenDevice for the
+    core devices (0 and 1). Now we can now legally register for events so we may
+    overwrite our device-independent classes with the ones selected for the VCP.
+    
+    So, increase the EMASKSIZE to MAX_DEVICES + 1 and use MAX_DEVICES as the ID
+    when we don't have a device.
 
-commit 90f2a82ba5aa6480d2299f99816a2ba351e24bee
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri May 23 22:39:09 2008 +0300
+commit f0c56ffd980db19bea271aeebf118bd931f6f40d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 24 12:58:49 2008 +0930
 
-    glx: fix forgotten swrast -> SWRast
-    (cherry picked from commit 21a8052fdca2115668dfc747b0b58db437b4eb6d)
+    dix: don't dereference dev->key if it doesn't exist.
+    
+    This may happen if we check for a passive grab on a floating pointer device.
 
-commit 6e278e3944cc32d165829f6ef64cbafbf9b513b7
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri May 23 22:38:36 2008 +0300
+commit 01f0b9c9784c55c94104bafa6dd545b373c64104
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jun 25 19:23:20 2008 -0700
 
-    glx: missing swrast is fatal
-    (cherry picked from commit 877e6c35ff1f0f110627590ac0f12fddf47de506)
+    xf86GetOptValFreq wants a pointer to double, but maxPixClock is an int
 
-commit 0845476521f5b9e9b477197d96d7ffe64be7ae3a
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri May 23 22:38:11 2008 +0300
+commit 7ce6dcef118139d0ccfc136b9a07f5bf0c078d70
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jun 25 15:06:49 2008 -0700
 
-    glx: drop stray glcore.h include
-    (cherry picked from commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a)
+    Don't log null device name in XkbDDXLoadKeymapByNames
 
-commit 6f18c5d7039be3c03185aee61fb74ac4cf593532
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri May 23 22:40:03 2008 +0300
+commit cbc20d92de92aad5ca240310a9156ccf97c24a01
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jun 25 09:52:36 2008 -0400
 
-    kdrive: need not export symbols for glx anymore
-    (cherry picked from commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35)
+    XTrap delenda est.
 
-commit a194718e9d83b488f21226332b8b5b250f48e274
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Wed May 21 13:33:36 2008 -0400
+commit a81b5ce452766bbc4b2ac0849711284ba8591b46
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 25 13:23:09 2008 +0930
 
-    Move GL/glx on level up now that it's the only thing left under GL.
-    (cherry picked from commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55)
+    dix: free memory associated with the EventList. #16507
+    
+    Un-deprecates CloseDownEvents.
+    
+    X.Org Bug 16507 <http://bugs.freedesktop.org/show_bug.cgi?id=16507>
 
-commit cb402b4112dc9e4cb21c9fc9327da301a70b6a8d
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Wed May 21 12:34:07 2008 -0400
+commit 3a2beb2f867fd47dc5a7723dcac345ea0b0ecf3d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 25 13:12:41 2008 +0930
 
-    Move the windows GL files to the xwin DDX.
-    (cherry picked from commit a8a9b40e554dd0c184866978889a39519afc466a)
+    dix: InitEventList does not need to be _X_EXPORT.
 
-commit 0234d3d48f462fcac9c526919812d829375f0a0c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Wed May 21 11:44:12 2008 -0400
+commit 385943e0e97463ce4681a9b6a4a40d7e3c91e51e
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Tue Jun 24 23:13:32 2008 -0300
 
-    Get out of the mesa symlinking business.
+    Set --enable-builtin-fonts as default.
     
-    This copies over the files generated from mesa/src/mesa/glapi.  There's
-    a corresponding mesa commit that makes it easy to generate the glapi files
-    straight into the xserver tree when the XML definitions change.
+    Some reasons to embed fonts by default:
+    1. X server doesn't pick a good default font path so it's easiest just
+    to built in the core fonts and let new X hackers more happy. Developers
+    and distro guys are wise enough to just set --disable-builtin-fonts
+    when they want.
     
-    The only few files that are copied from mesa but aren't generated are
-    glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
-    driver API and the whole setup is still a bit fragile, but it's not a new
-    problem.
+    2. Seems that this is by far the most popular FAQ
+    (http://www.x.org/wiki/FAQErrorMessages).
     
-    The --with-mesa-source configure option is still around since other
-    parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
-    but for common case of building with GLX and AIGLX support, that
-    option is no longer needed.
-    (cherry picked from commit e5aad4bc087036489e2af576628aa9b612054a6e)
+    3. No one gave a good argument to not do this:
+        http://lists.freedesktop.org/archives/xorg/2008-May/035479.html
 
-commit d3a2e060bfc322fbf7c55dd7d07472a0eeec18ef
-Author: Dan Nicholson <dbn.lists@gmail.com>
-Date:   Wed May 21 10:51:15 2008 -0700
-
-    Fix up paths for GL/glx -> glx renaming
-    (cherry picked from commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c)
-
-commit d325a207c83884ba1306af38a4d1c60b9bad18bb
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Wed May 21 10:18:16 2008 -0400
-
-    Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
-    (cherry picked from commit f558c7d4d1d87affe1ce4aec2e62ff64545f2bc8)
-
-commit bd81faff8c4d9cae5f6a4b424230a11706a508c5
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Wed May 21 10:17:53 2008 -0400
+commit f3b29efc4d7bb346cdd3fd79e780f1022c8f46e8
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Tue Jun 24 23:07:49 2008 -0300
 
-    Drop glcore GLX provider.
+    Remove NOFONTSERVERACCESS macro
     
-    Obsoleted by the DRI swrast driver.
-    (cherry picked from commit 77ff8fd5072fa57158463bfd84656389eeb7b503)
+    dix: this is semantically different but it goes through the same path in
+    the code.
 
-commit d88da6638eb133f93833933924711d9874c480a6
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Wed Apr 23 10:22:34 2008 -0700
-
-    Moved Apple GL bits into our DDX subtree
-    (cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
-    (cherry picked from commit d09c520b322ba5c5f4d6b630a7c0c62e56732f82)
-
-commit 500463f728927a3ca8d8167bc7c1b266142c93fe
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Tue May 20 16:56:27 2008 -0400
+commit 2ff7eb4995b663cf12a01124745de600f38d0bfc
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Tue Jun 24 22:09:34 2008 -0300
 
-    Stop symlinking glcontextmodes.[ch] from mesa.
-    (cherry picked from commit 61eaef22359ae2abcee7dcd73ee8610a83776fc7)
+    xfree86: kill INHERIT_LOCK_STATE macro.
+    
+    I don't know how this survived so long. Google didn't show
+    anything usable related with this.
 
-commit a569beba4cdad4af6e52c5a966475b4041365eda
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Thu Apr 24 18:21:42 2008 -0700
+commit a3ec22627355fc08730ad7e90022e374763d333f
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Jun 24 20:32:24 2008 -0400
 
-    XQuartz: Compile in missing glx source that we still need
-    (cherry picked from commit c611335dee267e41dcd1733a6bb5206b102f804e)
-    (cherry picked from commit 63853e4ad211945ed25541223207a78f83766ced)
+    Fix a leak in the code that parses the protocol names.
+    
+    Also added some comments.
+    Reported by Ben Gamari (bug #16492).
 
-commit 46e0bb6211cf711ef4dacf134404d79a530b5549
-Author: Ben Byer <bbyer@apple.com>
-Date:   Tue Apr 22 23:53:23 2008 -0700
+commit a4cb25f8c816adc3bdf6a28d5beb558e8be40121
+Author: Ben Gamari <bgamari@gmail.com>
+Date:   Tue Jun 24 12:08:35 2008 +0930
 
-    xquartz: remove vestigial aglGlx.c
-    (cherry picked from commit 40bd041e4255f26fcbdf0831e68619ae0f46ab39)
-    (cherry picked from commit 3685b171da51f853bfdb312d36622dfa03ee75be)
+    dix: free FocusPrivates when deleting a window. #16493
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+    
+    X.Org Bug 16493 <http://bugs.freedesktop.org/show_bug.cgi?id=16493>
 
-commit e8a1eda65d36af022ac8c245640a0d5f2ac1989a
-Author: Ben Byer <bbyer@apple.com>
-Date:   Mon Apr 21 22:06:38 2008 -0700
+commit 32a7bbbba6fec0535a8faa1d6d2ecebe786bcc81
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 24 09:28:05 2008 +0930
 
-    add missing DARWIN_GLX_LIBS in configure.ac
-    (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
-    (cherry picked from commit 744d0cfda74f8283801cc2d6c5eda48402455bc3)
+    xfree86: fix up leftover allocation of xf86Events.
+    
+    Thanks to Eamon Walsh for spotting this.
 
-commit 17ac93b23bcb3e2a1117c76b63b23c7439a96ef5
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Wed May 21 18:13:47 2008 +0300
+commit bcc88a1d46c7ba469c4e2861875f84f8c77d4b15
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 22 22:34:30 2008 +0930
 
-    glx: drop drm.h, sareaHandle from swrast loader
-    (cherry picked from commit 88f43e5d06fb5543bc40ca060b2c5d8e2673afad)
+    xkb: remove unused variable is_core.
 
-commit 988b1b8df319903d308d8ee232e991dab42e1c0b
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Tue May 20 16:36:22 2008 -0400
+commit 9ed9d98dec58d1f7468d02c4b951811b8e1ca7c1
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Jun 24 22:36:32 2008 +0200
 
-    Add loader for the swrast dri driver.
-    (cherry picked from commit 6ff6465931c397f72db27a4fd0ca0dcac0609537)
+    x86emu: fix build, fallout from 9719354
 
-commit 1efc0329b147eb6e25671ad3bcb5f12095d9f844
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri Apr 18 17:47:16 2008 +0300
+commit e9b4f3cd856e2401675452c387b4155246239f91
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Mon Jun 23 16:18:20 2008 -0400
 
-    glcore: drop GLcore (files)
-    (cherry picked from commit a88c6b66465c039bf92a54a496516fee4d900784)
+    Fix "warning: suggest parentheses around && within ||".
 
-commit 9b4d5b6521a8d6e02ab9cb534fbff3faa9f3a388
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri Apr 18 17:47:01 2008 +0300
+commit 8910dde96ec4318c9c44fb9717b6b52fad56cd1d
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Mon Jun 23 14:51:38 2008 -0400
 
-    glcore: drop GLcore (build system)
-    (cherry picked from commit dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e)
+    Fix "warning: assignment discards qualifiers from pointer target type".
 
-commit 1ea2e69cfcdf66f6b7834e503526d9d89fd69c09
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri Apr 18 17:46:18 2008 +0300
+commit 95d4ede538fbb68049ba3efa0acb0e9712e5cb01
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 20 23:49:32 2008 -0400
 
-    glcore: build from mesa, dlopen from xorg
-    
-    * The GLcore interface is disposable
-    * GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
-      GLX_PROVIDER_INSTALL_DIR
-    (cherry picked from commit 567d389d47dee233a973b101e04ce41c47a68f34)
+    Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
 
-commit f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4
-Author: Donnie Berkholz <dberkholz@gentoo.org>
-Date:   Mon Jun 9 16:01:53 2008 -0700
+commit fa1545eeda2a7feebc006840a44d390177634231
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 20 23:47:22 2008 -0400
 
-    glcore: prepare for dynamic loading
-    
-    glcore gets linked with -ldl, -lpthread for s3tc and glapi
-    xserver needs
-            DLOPEN_LIBS - to dlopen the glcore dso
-            LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
-    
-    the ld flag is added to kdrive only when GLX is enabled, the net overhead for
-    Xephyr is ~155KB, could be reduced with --dynamic-list.
-    (cherry picked from commit efb723e166e5fa89e90c7b400fb4c7979b1f50c0)
-    
-    Conflicts:
-    
-    	configure.ac
+    Fix "warning: passing argument 1 of `xf86addNewLoadDirective' from incompatible pointer type".
 
-commit 9029748f894e603bd7a963c4b868349dc1a73f5f
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Wed Jun 25 15:06:49 2008 -0700
+commit 2725ba1fca45e5ba241695e24333d8efab1f862b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jun 24 14:41:32 2008 -0400
 
-    Don't log null device name in XkbDDXLoadKeymapByNames
-    (cherry picked from 7ce6dcef118139d0ccfc136b9a07f5bf0c078d70 commit)
+    Also remove xorgconfig from configure.ac.
 
-commit 5d66908975c6549f459da5bc70358d65c4de76e9
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Tue Jun 24 20:32:24 2008 -0400
+commit 9719354ae04a41e9834ac9ba8fd9e895092ba4f1
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jun 24 14:37:06 2008 -0400
 
-    Fix a leak in the code that parses the protocol names.
+    Check for __amd64__, not __x86_64__.
     
-    Also added some comments.
-    Reported by Ben Gamari (bug #16492).
-    (cherry picked from commit a3ec22627355fc08730ad7e90022e374763d333f)
+    Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe.  Intel's C
+    compiler claims to be gcc-compatible; if they're not defining the same
+    macros as gcc then that's their bug, not ours.  Even if we were to do
+    this aliasing we should do it once and for all in servermd.h.
 
-commit 7351c07ae89986bde8053afd8cdcc6a390fd93d5
+commit 249c892784ca5e8c75863dd82097ca2bedec4723
 Author: Roland Bär <roland@verifysoft.de>
 Date:   Tue Jun 24 14:13:02 2008 -0400
 
     Bug #11857: Avoid running off the end of a MAXCLIENTS-sized array.
-    (cherry picked from commit 249c892784ca5e8c75863dd82097ca2bedec4723)
 
-commit 429b2a97a041a68d96e24d3e924a06a77ba44c96
+commit 9e5b3deafb97ec1f83e6bfe067bc68df7385bc6a
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Jun 24 14:08:04 2008 -0400
 
@@ -1402,9 +10648,14 @@ Date:   Tue Jun 24 14:08:04 2008 -0400
     Use only %di to name the PCI register to read/write, rather than %edi.
     DOS is only expecting the base PCI config space anyway, and the BIOS
     might be using the high bits of %edi.
-    (cherry picked from commit 9e5b3deafb97ec1f83e6bfe067bc68df7385bc6a)
 
-commit 3dfe90fe6c325a7a40ee6c613be444d4b8e32971
+commit d34430414ac0e77eec61ab0ac9ef427b236eb639
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jun 24 13:32:55 2008 -0400
+
+    Remove xorgconfig.  Use X -configure instead.
+
+commit 574c62e305e5380bb1b0f4bfec4f7cc3e3f03ada
 Author: Owen Taylor <otaylor@fishsoup.net>
 Date:   Tue Jun 24 12:40:47 2008 -0400
 
@@ -1412,63 +10663,38 @@ Date:   Tue Jun 24 12:40:47 2008 -0400
     
     Only do no-src-alpha optimizations for a RepeatNone source if we can
     easily probe that we won't sample outside the edges of the source.
-    (cherry picked from commit 574c62e305e5380bb1b0f4bfec4f7cc3e3f03ada)
 
-commit 3a7657b7131c16682c34dfc739c430b36fb3d4db
-Author: Hasso Tepper <hasso@estpak.ee>
-Date:   Tue Apr 8 13:00:38 2008 +0300
-
-    configure.ac: Fix monotonic test harder
-    
-    This was only introduced in a later version of POSIX, so define that
-    version to get it from more conformant systems.
-    (cherry picked from commit 08073862f8c4e1219b6459708ffd28e2bc35885f)
-
-commit a8a633478301e6d6854a7e75a0d38f63b7746ee6
+commit 100afae578e59e31b65a6264c281ba7deea5ac39
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Jun 24 10:52:31 2008 -0400
 
     Bug #15586: (Correctly) refuse to redirect the root window.
-    (cherry picked from commit 100afae578e59e31b65a6264c281ba7deea5ac39)
 
-commit 2334ff9bb2690a775eea676469f6677f8d701cb3
+commit 4c4e06af7950df509fa02099788be66cf37a4d01
 Author: Paul Bender <pebender@gmail.com>
 Date:   Tue Jun 24 10:44:47 2008 -0400
 
     Bug #15665: Fix building without Composite.
-    (cherry picked from commit 4c4e06af7950df509fa02099788be66cf37a4d01)
 
-commit 85e598cc62a5b87feec43eb9bf46026e2803ee14
+commit 59510a76436c739fd9421f01cc4210607d9e7f57
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Jun 24 10:40:36 2008 -0400
 
     Remove some default modes that really shouldn't be in the default set.
-    (cherry picked from commit 59510a76436c739fd9421f01cc4210607d9e7f57)
-
-commit 2f8ad7f938ee31583b0da0d3dce0980832dd68d3
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon May 12 18:49:34 2008 -0700
-
-    Check for strcasestr and workaround it on systems without it
-    (cherry picked from ed65e8b4f02a6da7f1c5d85984a9ccf6a94d0181 commit)
 
-commit dfb326790e4131d0c9700cb879dc812b1e8e7529
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon May 19 18:43:29 2008 -0700
+commit b622f6dc5d8d70d17be0374a85a9b16b43a62a01
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Mon Jun 23 23:45:57 2008 +0200
 
-    Restore return type on xf86SetScrnInfoModes
-    
-    Seems to have been accidentally lost by commit 	76943fec860315f3c93539e59a59080b8a7b3e75
-    (cherry picked from 925e895b869e461a9e7f135891463c56ee633cd6 commit)
+    kdrive: fix building with --disable-xv (bug#16488)
 
-commit 4c8a84acf5b911c7daa2f63ca27cf1f3988c3304
+commit 3b587826924c60f6736dc5faf584b964fde1b4da
 Author: Jesse Ruffin <jesse@eloquentpeasant.net>
 Date:   Mon Jun 23 14:35:20 2008 -0400
 
     Bug #16302: Fix GLX drawable refcounting in DMX.
-    (cherry picked from commit 3b587826924c60f6736dc5faf584b964fde1b4da)
 
-commit 89d73d759588da2cb9048c6149a456700ad660e8
+commit c8d066a15142678041c1d82ccf530dcdb2ea74ca
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Jun 23 13:59:48 2008 -0400
 
@@ -1477,16 +10703,8 @@ Date:   Mon Jun 23 13:59:48 2008 -0400
     Yes, this is a 486+ instruction and thus not strictly legal in vm86
     mode, but enough BIOSes use it (looking at you VIA) that we might as
     well implement it.
-    (cherry picked from commit c8d066a15142678041c1d82ccf530dcdb2ea74ca)
 
-commit b0df9a6a421de5ed49a898cb01527bc40baf5814
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Mon May 19 02:24:17 2008 +0200
-
-    preserve errno around the SIGIO handler
-    (cherry picked from commit 19c7e9da55646f1f6e05c28cd71865cd8d84e1ff)
-
-commit fc37f8fcb20663159d2a8cef6c9bfca039465534
+commit b55fbca4f0705aeff1c69d3ef851c5ff5af6ed94
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Jun 20 13:27:32 2008 -0400
 
@@ -1495,77 +10713,258 @@ Date:   Fri Jun 20 13:27:32 2008 -0400
     ... instead of creating pixmaps that only fb knows about, which will
     have no devPrivates for any other subsystem and thus cause havoc if
     (when) they leak out.
-    (cherry picked from commit b55fbca4f0705aeff1c69d3ef851c5ff5af6ed94)
 
-commit 7e3ec36e0e87c8592e6783319dcc1fe0246fbffe
-Merge: d254903... ad10515...
+commit 155fcecb320dbcfb899d6bcd78048ce0993bf28b
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Wed Jun 18 09:20:05 2008 +0200
+Date:   Mon May 19 08:09:33 2008 +0200
 
-    Merge branch 'server-1.5-branch' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver into server-1.5-branch
+    Various messages clean-ups.
 
-commit ad10515b6c19f224fb6897e9549c5ddee373a557
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Tue Jun 17 19:09:44 2008 -0400
+commit 41a65e110409a290288180e8e1517f053f877586
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Mon May 19 06:12:04 2008 +0200
 
-    SELinux: Add an extension alias under the OS-agnostic "Flask" name.
-    (cherry picked from commit 79dd600942bbac3c6b531f284b42c7b2c822da90)
+    Fix ipc check on OpenBSD
 
-commit eed6713d3d6b700ce01a70c3a5a37a6f928d79c7
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Tue Jun 17 17:55:11 2008 -0400
+commit ce4d4b3c1b0e25f64d6f781b09528b2f3ae33207
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Mon May 19 05:19:01 2008 +0200
 
-    SELinux: Bring server-side name registry up to date.
-    (cherry picked from commit 656d3d7623c6b83024e9cdc60d1257f4d87aa268)
+    build fix
 
-commit 7822a3d05f935cca3bfa47d15d961596652ecfca
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Jun 17 16:10:51 2008 -0400
+commit 19c7e9da55646f1f6e05c28cd71865cd8d84e1ff
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Mon May 19 02:24:17 2008 +0200
 
-    XAA: Disable offscreen pixmaps by default.
+    preserve errno around the SIGIO handler
+
+commit 0a81d476388c51f8aa723400dffc375e112ea97a
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Mon May 19 02:20:44 2008 +0200
+
+    Remove RCS Id.
+
+commit c0d7ad9c88172d753b932069743ae65f75de3aa9
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Thu Jun 19 16:51:18 2008 +0200
+
+    Let code build with gcc 2.95
+
+commit 219dd2d44a9da40427ad48b0f09b981fe0551f4b
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun May 18 13:53:32 2008 +0200
+
+    sprintf() -> snprintf()
+
+commit cfcb3da75e807dec225cc7ea469e04d2db10bf73
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Jun 18 11:37:00 2008 -0700
+
+    Make button down state a bitmask. Master buttons track union of slave buttons
     
-    Say Option "XaaOffscreenPixmaps" to turn them back on.
+    Mixing usage where some parts of the code treated this field as a bitmask
+    and other parts as an array of card8 was wrong, and as the wire protocol
+    wanted bitmasks, it was less invasive to switch the newer counting code use
+    booleans.
+    
+    Master devices track slave buttons by waiting for all slave buttons to be
+    released before delivering the release event to the client.
     
-    Apropos of bugs #13795 and #15098.  Not yet applied to master as this wants
-    a proper solution someday, but then, those bugs aren't closed yet either.
+    This also removes the state merging code in DeepCopyDeviceClasses -- that
+    code was changing master device state without delivering any events,
+    violating protocol invariants. The result will be that existing slave
+    button state which does not match the master will not be visible through the
+    master device. Fixing this would require that we synthesize events in this
+    function, which seems like a bad idea. Note that keyboards have the same
+    issue.
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 
-commit d900de5a8f61e1ee000c1a96fa6c6121ac2a92ae
+commit 3cc5ae6a4f725483612c00fc8bcc2c61607f66a8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 18 16:14:42 2008 +0930
+
+    dix: don't attempt to send Enter/Leave events if we have a keyboard.
+    
+    Dereferencing into dev->valuator could crash the server, although it looks
+    like I could only reproduce this by having a keyboard send an event after it
+    was created and the WM was still replaying. Or so.
+
+commit 528b4e36ade482df99747081688ae52cfaeb28eb
+Author: Alan Hourihane <alanh@tungstengraphics.com>
+Date:   Wed Jun 18 22:34:02 2008 +0100
+
+    Set driverPriv immediately on CreatePixmap.
+    
+    If it's NULL anyway, we bail, if not, it lets
+    ModifyPixmapHeader know about the private.
+
+commit 068fa63496c7c363706f0d356b5132bc591c04c6
 Author: Michel Dänzer <michel@tungstengraphics.com>
-Date:   Tue Jun 17 13:13:23 2008 -0400
+Date:   Wed Jun 18 09:23:09 2008 +0930
 
-    AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
+    dix: fix a crash when the client has a different byteorder.
     
-    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit d21155a3e9b51df946766926bc6155c8972c4439
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 15 20:00:41 2008 +0930
+
+    input: fix up usage of button->down, used to be a bitmask, is now an array.
     
-    (cherry picked from commit 23b55a61f89f69454a3b0e3413b1f07d5fdf43aa)
+    device->button->down used to be a 32-byte bitmask with one bit for each
+    button. This has changed into a 256-byte array, with one byte assigned for
+    each button. Some of the callers were still using this array as a bitmask
+    however, this is fixed with this patch.
+    
+    Thanks to Keith Packard for pointing this out. See also:
+    http://lists.freedesktop.org/archives/xorg/2008-June/036202.html
+
+commit 2b9c829bdebd16910bdf48b9d64862e3d34f5b7f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 18 09:55:53 2008 +0930
 
-commit fba700f1f6a89761c99fe0b3dce60e1b2bb474f4
+    Xi: don't drop the grab status in XExtendedGrabDevice().
+
+commit 4f3ed54dc9ea7780ff03378b13de0fddfdec2e15
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 17 10:43:36 2008 +0930
+
+    mi: remove trailing whitespaces from misprite.c
+
+commit 79dd600942bbac3c6b531f284b42c7b2c822da90
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Jun 17 19:09:44 2008 -0400
+
+    SELinux: Add an extension alias under the OS-agnostic "Flask" name.
+
+commit 656d3d7623c6b83024e9cdc60d1257f4d87aa268
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Jun 17 17:55:11 2008 -0400
+
+    SELinux: Bring server-side name registry up to date.
+
+commit f3490d3eba94c7d9e760d6d21991ab6677196c2b
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Tue Jun 17 10:35:24 2008 -0400
 
     Bug #15169: Make the server build again on Alpha.
     
     Still won't work until the kernel makes the resource files actually exist.
+
+commit 8c9234a163eceda2abc0a2523e0f5587ea399935
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Jun 15 10:01:28 2008 +0930
+
+    Xi: avoid double button mapping.
+    
+    Button events were mapped once in GetPointerEvents and then again in
+    UpdateDeviceState. While it might make sense to just fix up UpdateDeviceState,
+    it turns out to be better to leave the raw button number in the event because
+    DGA reports raw device events without button translation, and so when it calls
+    UpdateDeviceState, the button down counts get scrambled and buttons get stuck
+    down.
+    
+    See also:
+    http://lists.freedesktop.org/archives/xorg/2008-June/036201.html
     
-    (cherry picked from commit f3490d3eba94c7d9e760d6d21991ab6677196c2b)
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 
-commit d2549034133a92d1f5755edd9c34ee84e601d753
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Sat Jun 14 14:40:32 2008 -0600
+commit d894e86aa5bea81147c4a7ad8630bcfb04156792
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 15 10:55:08 2008 +0930
 
-    configure.ac: fix the help string for --with-freetype.
+    randr: remove superfluous check against uninitialised variable.
     
-    Default value was changed to 'no' in e5b1d38e142807b59ce4ec89764c949f707ec541
-    but the help string wasn't updated.
+    Thanks to Eamon Walsh for pointing this out.
 
-commit c2877c073b4d02850b1f85ba2ba80e68a74e43cd
-Merge: a645b47... 2552026...
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Sat Jun 14 14:32:42 2008 -0600
+commit 5544c51447f551dfc6df64438873a7ce64743976
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 22:49:47 2008 -0400
+
+    Fix "warning: the address of ‘newTypes’ will always evaluate as ‘true’".
+
+commit 2391c409a2840d61fed93832650c0d6c82ebebdf
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 22:48:17 2008 -0400
+
+    Fix "warning: unused variable `s'".
+
+commit 61dafe384a88fc397d7cd55cb23f4fdc3fb0645c
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 22:47:10 2008 -0400
+
+    Fix "warning: unused variable `tsize'".
+
+commit 37a64b02df02d42a19d4b777930dc5e457d97d63
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 22:41:58 2008 -0400
+
+    Fix "warning: ‘rc’ may be used uninitialized in this function".
+
+commit e90fcd8294fe763c97610d39cab50f2836f87dca
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 22:26:43 2008 -0400
+
+    Fix "warning: no previous prototype for ‘miRROutputGetProperty’".
+
+commit 0b00bbca5df140edbfaffab627bd82165f1b1420
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 22:22:22 2008 -0400
+
+    Fix "Warning: no previous prototype for `SecureRPCInit'".
+
+commit 1c2f038d69605b0ed1067e47dc75ca6f216991f5
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:59:09 2008 -0400
+
+    Fix multiple warnings in os/xdmauth.c.
+
+commit 384ebe02b354bf1ad0a2ac25e4b5290f2e795ea1
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:49:01 2008 -0400
+
+    Fix "warning: label ‘done’ defined but not used".
+
+commit 720e44f9730b9e275579483c2a34b16bba77e146
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:42:37 2008 -0400
+
+    Fix "warning: no previous prototype for ‘XevieExtensionInit’".
+
+commit 9d871e19c9dee5d3ee7f123249e8890417d83093
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:35:29 2008 -0400
+
+    Fix "warning: unused variable ‘pDev’, `pPointer'".
+
+commit 60f64af075e8ac3e63586452f2f3d338a05785f0
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:23:31 2008 -0400
+
+    Fix "warning: passing argument 1 of 'pixman_fill' from incompatible pointer type".
+
+commit c448460fdc23262f2b711a32599090c85c70447a
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:05:26 2008 -0400
 
-    Merge branch 'server-1.5-branch' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver into server-1.5-branch
+    Fix "warning: pointer targets in assignment differ in signedness".
 
-commit 255202666411e15ebe2f9cde35b48a333dc9e38c
+commit 17ed6242e73c5f733601b15732ab30c23acf14d2
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:03:17 2008 -0400
+
+    Fix "warning: assignment from incompatible pointer type".
+
+commit 02a8b118cd07d98f12aab8325d8443125703ba7d
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Jun 13 21:01:50 2008 -0400
+
+    Fix "warning: implicit declaration of function ‘miPointerGetScreen’".
+
+commit 2d7ba09dc4b5eff5dba8d7867f285111574b1737
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Jun 13 16:39:40 2008 -0400
 
@@ -1573,136 +10972,133 @@ Date:   Fri Jun 13 16:39:40 2008 -0400
     
     This is required to preserve compatibility across changes to the
     internal representation of the privates list.
-    (cherry picked from commit 2d7ba09dc4b5eff5dba8d7867f285111574b1737)
 
-commit a645b47f047375fb81a87bbbc245369f680a6dab
-Merge: 6de2855... 2124870...
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Thu Jun 12 14:22:32 2008 -0600
+commit 9e0e558f263a132babf8c91d31230831653f19c1
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Jun 13 11:17:49 2008 -0400
 
-    Merge branch 'server-1.5-branch' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver into server-1.5-branch
+    Fix unterminated endif.
 
-commit 21248705bbd9876ea6d2d78a85bedc4904c63899
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Thu Jun 12 14:54:56 2008 +1000
+commit 6bbfadb9094bb6437a6825b8293d13a32e041aff
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Jun 13 11:00:50 2008 -0400
 
-    modes: make aspect choosing work on single output case.
+    ... and stay dead.
+
+commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Jun 13 10:35:07 2008 -0400
+
+    Death to mfb.
     
-    In the single output enabled case we never enter the loop and test
-    never gets set and so we fail to match a good mode.
+    Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
+
+commit af86c3b7ce705c1711c8cf8bf05a7a02b8afccf6
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Sat May 24 21:16:34 2008 +0300
+
+    clean .gitignore
+
+commit 3108980f5e78c129b23ff32f72564cf9a746c693
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri Jun 13 15:58:56 2008 +0300
+
+    glx: drop unused cleargc
+
+commit 23b55a61f89f69454a3b0e3413b1f07d5fdf43aa
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Fri Jun 13 11:13:56 2008 +0200
+
+    AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
     
-    This was causing my 2560x1600 to end up at 2048x1536.
+    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
 
-commit 53a84d75c65f75c629c6610a2ec4093507cea3f7
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Fri May 23 23:00:40 2008 +0200
+commit d15b3790307053587df8daed1936ff6923881b63
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jun 12 16:00:50 2008 -0400
 
-    xfree86: fix build on GNU/kFreeBSD
+    Remove xgl.
     
-    GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
-    Unify preprocessor conditionals between variable declaration and use.
-    Debian bug #482550.
-    (cherry picked from commit e6cbb1e11e5da1a8b9001853c25f4e5a052e7110)
+    This code hasn't been updated with anything even resembling what anyone is
+    shipping in nearly thirty months.  It hasn't built out of the box since
+    7.1.  Most of its features over AIGLX are accomplished with DRI2 and
+    friends.
 
-commit 336a46c51932b9af7732e575f7ff43e41e47649e
-Author: George Sapountzis <gsap7@yahoo.gr>
-Date:   Fri May 23 22:39:35 2008 +0300
+commit c37a93b4850866c713e3cbf39a08bbc9645e24d4
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Jun 12 14:54:56 2008 +1000
 
-    glx: fix memory corruption with r5g6b5
+    modes: make aspect choosing work on single output case.
     
-    should cherry-pick to xserver-1.5
-    (cherry picked from commit 6c72961d8fa1ab1543f1b3e2cc7d34ff6d254bf8)
+    In the single output enabled case we never enter the loop and test
+    never gets set and so we fail to match a good mode.
+    
+    This was causing my 2560x1600 to end up at 2048x1536.
 
-commit 38f573566e3218bd385a4940a6f9be700bc4f937
+commit 23e71ef71a178505494d4b410f9314acfff81524
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Thu Jun 12 09:04:24 2008 +1000
 
     dbe: fix DoS reported by iDefense.
     
     This isn't a security problem just a user could DoS themselves for fun or profit.
-    (cherry picked from commit 23e71ef71a178505494d4b410f9314acfff81524)
 
-commit 59a52d8151aeb607f39394ceb36ed69b9c2a15d5
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Thu May 8 16:58:31 2008 +0930
+commit 390b155135a451fa728b73c8107aea91dfd56ed1
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Jun 11 18:21:33 2008 -0300
 
-    config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
+    Welcome to hotplug era.
     
-    The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
-    specifies a X-specific {rmlv}, then this is overridden through the use of
-    input.x11_options.Xkb{RMLV}.
-    However, the way how the server parses options--by ignoring capitalisation,
-    underscores and spaces--the HAL and the x11_options would override each other.
+    `rm -rf xorg.conf` does not imply an error message. Maybe a warning.
     
-    So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
-    only actually add them to the device after parsing _all_ options.
-    
-    * rmlv ... rules, model, layout, variant
-    
-    See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
-    (cherry picked from commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17)
-    (cherry picked from commit ff013b0da4e6d33b2b69ce1212e9bd62050574e1)
+    checkInput() is defined but not used.
 
-commit 82e7cf12453a4f91324c07581b59887dcc27014e
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Thu May 8 14:05:56 2008 +0930
+commit 6e018f6a30dab1259b8fdc1ae4c84056b2acf362
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Jun 11 18:10:55 2008 -0300
 
-    config: remove trailing whitespaces.
-    
-    It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
-    (cherry picked from commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8)
-    (cherry picked from commit 901978ebe0f446532255701cd536e246e805a55b)
+    No need for inputPending field in xf86Info.
 
-commit b4c5832c75164ad08bc43c37a214b90353653a38
-Author: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date:   Tue Mar 25 17:37:25 2008 +0100
+commit 881e551de92e5664f92ef1961092e35cd7a77b15
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Jun 11 18:03:33 2008 -0300
 
-    Support to pass arbitrary options via HAL hotplugging
-    
-    Parse "input.x11_options" and pass every key/name pair to the driver.
-    Remove check for input.capabilities, because that's part of the fdi files.
-    
-    Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch.
-    (cherry picked from commit 47eb658e802775021e3efec109f95431cca188ca)
+    CopyGetMasterEvent() can be static.
 
-commit 626ea1b02dabc218f7f73adead8ee9b287d0648e
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:20:00 2008 -0600
+commit 656949cbe24648a5b58f7df6ed49b25af0b47601
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Jun 11 17:57:19 2008 -0300
 
-    CVE-2008-1377 - RECORD and Security extensions memory corruption
+    Remove more unused things.
     
-    Lack of validation of the parameters of the
-    SProcSecurityGenerateAuthorization SProcRecordCreateContext
-    functions makes it possible for a specially crafted request to trigger
-    the swapping of bytes outside the parameter of these requests, causing
-    memory corruption.
-    (cherry picked from commit 95d162c4389857d960da9b0158345c1714e91f31)
+        In function ‘miSpriteCloseScreen’:
+        warning: unused variable ‘pDev’
 
-commit e83c79701f0abc081f1b127785d5502e2e48f905
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:20:43 2008 -0600
+commit 84db8837d0faaac008be61df9f1261cd3028e923
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Jun 11 17:47:00 2008 -0300
 
-    CVE-2008-1379 - MIT-SHM arbitrary memory read
-    
-    An integer overflow in the validation of the parameters of the
-    ShmPutImage() request makes it possible to trigger the copy of
-    arbitrary server memory to a pixmap that can subsequently be read by
-    the client, to read arbitrary parts of the X server memory space.
-    (cherry picked from commit 063f18ef6d7bf834225ddfd3527e58c078628f5f)
+    Remove unused xf86DeviceCursorUndisplay() function.
+
+commit dba5455f06c439c7e7d399f30dc7067e98e6e50b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed Jun 11 11:41:34 2008 -0400
 
-commit 69b173c6997954277dbd23eecc2cbf74e74ab228
+    Un-K&R shm extension.
+
+commit 9171206db349a0c6fda719746be0b15049d57aaa
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:21:26 2008 -0600
+Date:   Tue Jun 10 12:23:03 2008 -0600
 
-    CVE-2008-2360 - RENDER Extension heap buffer overflow
+    CVE-2008-2362 - RENDER Extension memory corruption
     
-    An integer overflow may occur in the computation of the size of the
-    glyph to be allocated by the AllocateGlyph() function which will cause
-    less memory to be allocated than expected, leading to later heap
-    overflow.
-    (cherry picked from commit c5f69b297b1227cb802394fa90efdbe1de607f3c)
+    Integer overflows can occur in the code validating the parameters for
+    the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
+    and SProcRenderCreateConicalGradient functions, leading to memory
+    corruption by swapping bytes outside of the intended request
+    parameters.
 
-commit b251fdd9d90532871b2a2b2f44a64b0e769fe3fc
+commit 5257a0f83d5f3d80d0cd44dd76d047bac3869592
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Tue Jun 10 12:22:30 2008 -0600
 
@@ -1712,22 +11108,19 @@ Date:   Tue Jun 10 12:22:30 2008 -0600
     glyph to be allocated by the ProcRenderCreateCursor() function which
     will cause less memory to be allocated than expected, leading later to
     dereferencing un-mapped memory, causing a crash of the X server.
-    (cherry picked from commit 5257a0f83d5f3d80d0cd44dd76d047bac3869592)
 
-commit edd2cac9fa05fdd0eceee3dd571f753acb9012ba
+commit c5f69b297b1227cb802394fa90efdbe1de607f3c
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:23:03 2008 -0600
+Date:   Tue Jun 10 12:21:26 2008 -0600
 
-    CVE-2008-2362 - RENDER Extension memory corruption
+    CVE-2008-2360 - RENDER Extension heap buffer overflow
     
-    Integer overflows can occur in the code validating the parameters for
-    the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
-    and SProcRenderCreateConicalGradient functions, leading to memory
-    corruption by swapping bytes outside of the intended request
-    parameters.
-    (cherry picked from commit 9171206db349a0c6fda719746be0b15049d57aaa)
+    An integer overflow may occur in the computation of the size of the
+    glyph to be allocated by the AllocateGlyph() function which will cause
+    less memory to be allocated than expected, leading to later heap
+    overflow.
 
-commit 6de2855b888e19c13d03d5e900248c1428724104
+commit 063f18ef6d7bf834225ddfd3527e58c078628f5f
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Tue Jun 10 12:20:43 2008 -0600
 
@@ -1738,7 +11131,7 @@ Date:   Tue Jun 10 12:20:43 2008 -0600
     arbitrary server memory to a pixmap that can subsequently be read by
     the client, to read arbitrary parts of the X server memory space.
 
-commit ebd916314de1f4570964312e008b17a9c96800ea
+commit 95d162c4389857d960da9b0158345c1714e91f31
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Tue Jun 10 12:20:00 2008 -0600
 
@@ -1750,83 +11143,468 @@ Date:   Tue Jun 10 12:20:00 2008 -0600
     the swapping of bytes outside the parameter of these requests, causing
     memory corruption.
 
-commit a1733327aa71bc1131e758fc80566c3d66627343
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:23:03 2008 -0600
+commit 656d5d98855eb608ec6581f8c574f343a216ea32
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 11 17:32:59 2008 +0930
 
-    CVE-2008-2362 - RENDER Extension memory corruption
+    kdrive: fix wrong use of &, should be | instead.
     
-    Integer overflows can occur in the code validating the parameters for
-    the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
-    and SProcRenderCreateConicalGradient functions, leading to memory
-    corruption by swapping bytes outside of the intended request
-    parameters.
+    Fallout from 26e7e69ab893d1f2b35213250ada40ec90944f62
 
-commit 5677751a0480426beaefc990303c7ade963eb137
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:22:30 2008 -0600
+commit 6528eb885dea0326aacdd026d44d82ab07f4a4fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 11 15:01:36 2008 +0930
 
-    CVE-2008-2361 - RENDER Extension crash
+    Xext: init firstValuator to zero, otherwise core XTest events may get lost.
+
+commit 6ab311c92d036dc63ee92ab4bb231f5f61ebe69f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 9 11:45:57 2008 +0930
+
+    dix: Call RealizeCursor during InitializeSprite.
     
-    An integer overflow may occur in the computation of the size of the
-    glyph to be allocated by the ProcRenderCreateCursor() function which
-    will cause less memory to be allocated than expected, leading later to
-    dereferencing un-mapped memory, causing a crash of the X server.
+    RealizeCursor should be called when the cursor is allocated. However, when the
+    root cursor is allocated, no devices exist yet, and thus RealizeCursor is
+    never called. This may lead to segfaults lateron in DDXes like Xnest that
+    actually need to do something for each cursor, and lateron rely on that
+    DDX-specific data for each cursor has been initialized.
 
-commit f7c40a003d85b8a83d55a33d362f2a364f4ab702
-Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date:   Tue Jun 10 12:21:26 2008 -0600
+commit e083b5a07507d53de0d1d365ef1565346284c997
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 9 11:23:53 2008 +0930
 
-    CVE-2008-2360 - RENDER Extension heap buffer overflow
+    xnest: wrap the xnest cursor sprite funcs around the mi funcs.
     
-    An integer overflow may occur in the computation of the size of the
-    glyph to be allocated by the AllocateGlyph() function which will cause
-    less memory to be allocated than expected, leading to later heap
-    overflow.
+    Modelled after the xfree86 code. Call miDCInitialize to init the SW rendering
+    engine, then take the pointers, store it in a xnest-local variable, and put
+    the xnest-specific sprite funcs in place. In the xnest sprite funcs, call
+    through to the mi sprite funcs after doing xnest-specific stuff.
 
-commit 8259d19f7155d82197ecc2aa16b316376c2dcb12
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Tue Jun 10 18:33:57 2008 +0300
+commit ea6a02c048e8589e99ee3b459f3612eb3d041558
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 9 11:22:33 2008 +0930
+
+    mi: protect mipointrst.h against multiple includes.
+
+commit a3a7c12fcf8e4ac1418f9ea53f76091f309a721b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 8 23:38:45 2008 +0930
 
-    Xi: event_{x,y} should refer to the extended device (bug #16289)
+    xfree86: Fix up xf86ScaleAxis
     
-    ProcessOtherEvents was unconditionally stomping the root_{x,y}
-    co-ordinates provided by GetPointerEvents with those of the core
-    pointer, meaning that both root_{x,y} and event_{x,y} reported to
-    clients would reflect the sprite's position, not the position reported
-    by the device that generated the DeviceMotionNotify or the
-    DeviceButton{Press,Release} event in the first place.
+    Some driver still call it, so we might as well work correctly. Always
+    resetting X to the Sxhigh is sub-optimal.
+
+commit f8431a62d57ab3118a0b409bce977db8261e2930
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Jun 10 02:15:25 2008 -0700
+
+    XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
+    (cherry picked from commit 4505bae5d7341e1241be50c25cb3d1b941701de4)
+
+commit c180a52332385b98635068d63a8fe0bba4835be7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Jun 10 10:47:37 2008 -0700
+
+    XQuartz: Removed code path for old startup
+    (cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
+
+commit 49751fee3b82ebc4917bfb168ec78aad7874f1f1
+Author: Roland Scheidegger <sroland@tungstengraphics.com>
+Date:   Tue Jun 10 15:40:48 2008 +0200
+
+    glx: copy msaa visual capabilities
+
+commit 5170c169db78cad3fe47dee4e438b48e67f0c7d1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Jun 10 01:39:15 2008 -0700
+
+    XQuartz: Fixed the "laggy" startup under the new model.  This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
+    (cherry picked from commit ee92aced10d0743c4658e53b58b5d9f5a094a415)
+
+commit 01ace5f3fd56bc789ad7448059fcf907ef19a1c8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 4 18:28:20 2008 -0700
+
+    XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
+    (cherry picked from commit d8cf5623faab952a0f1196c8fe10baa09d1fc089)
+
+commit 607b0d09ea003f87cfb3331e59e13495a483832a
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Mon Jun 9 09:52:04 2008 -0700
+
+    CreateColormap returns Success on success, not TRUE.
     
-    For key events we still take the sprite's co-ords, as we're delivering
-    to the focus, which is the (VCP) sprite.
+    Fixes a problem where enabling color index overlays disables the RENDER
+    extension.
+
+commit 2854abd39d4deb79c9ee9bcc931fad969392cfc5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 8 23:20:11 2008 +0930
+
+    xnest: fix up sprite funcs to stop compiler warnings.
+
+commit c68ca0c7b2c72df0501d26bf7f640029ff2d9568
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 8 23:14:20 2008 +0930
+
+    xnest: switch to using EventList rather than xEvents.
+
+commit 34429d16d319ef2709c22a5c22f45d0e82c78b20
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 8 23:08:34 2008 +0930
+
+    xnest: call miDCInitialize rather than miPointerInitialize.
     
-    Not cherry-picked from master as MPX fixes this anyway, by taking the
-    co-ords of the sprite the device moves (be it visible or no).
+    This unfortunately gives us a lots of artefacts, so cursor rendering cannot be
+    assumed complete. But it's better than crashing.
 
-commit 4e3cf7cd893e10fee21bc3c92d1cb3d308be1fe3
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Fri May 23 03:09:04 2008 +0200
+commit a7d4bec884c24c0e1792fd7d6677cdd0a69978e3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 8 23:03:20 2008 +0930
 
-    Add xkbstr.h and xkbsrv.h to sdk_HEADERS
-    (cherry picked from commit 150c2f55a508ed24b230f68e30ec140c0901d9ae)
+    mi: remove leftover old license comment.
 
-commit c7c43285b139952d03e60db1b95306941ad094ee
-Merge: facf271... 77313bd...
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Jun 9 17:06:41 2008 -0400
+commit 585125685b5f09245021c8ee15f57950fe6cdd20
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 8 22:43:47 2008 +0930
+
+    ephyr: some whitespace changes.
+
+commit 782394fe53220deafed06ad282b5f9ce42964c42
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Jun 6 12:10:35 2008 +0200
 
-    Merge branch 'server-1.5-branch' of git+ssh://git.freedesktop.org/git/xorg/xserver into server-1.5-branch
+    mi: Fix typo in comments about deprecated functions
 
-commit facf271b052eb1ee6b9c577d51991333372fa8c1
+commit 6b96281100f2118fe9d99536c33d48298a5bce7b
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Fri Jun 6 11:01:03 2008 +0200
 
     EXA: Fix exaGetPixmapFirstPixel() crash if the driver has a CreatePixmap hook.
     
     Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16243
-    (cherry picked from commit 6b96281100f2118fe9d99536c33d48298a5bce7b)
 
-commit 60990c69b43046795bbc2311b3e4f27771b988c1
+commit d25ffcfbfcfe8e059f2889873c9dbe76a28ad00c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jun 5 15:29:35 2008 +0930
+
+    mi: protect against possible NULL-pointer dereference.
+
+commit 874dcdb3bdb9320aae252d3c7927d412685059d5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jun 5 15:38:48 2008 +0930
+
+    dmx: remove a ifndef XINPUT, XINPUT is always defined now.
+
+commit 52752911ea8470dd8805f5e6c3febb9e1e1cc4b3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 17:04:16 2008 +0930
+
+    dmx: don't free event list after use.
+
+commit 5c5e58124581b845a6bfa7a2991a4e0ee7f7ebdb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 16:58:31 2008 +0930
+
+    dmx: add an XFlush.
+    
+    Beats me why we need it, but without it we get segfaults lateron.
+
+commit 246c10441bbf62646b77993b55233d5ceb93a81f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 16:37:25 2008 +0930
+
+    dmx: fix false memory allocation.
+    
+    beNumVisuals and the number of GLX Visuals can be significantly different.
+
+commit 17cd26225749a1daf7460b44e52f43082399b265
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 16:05:36 2008 +0930
+
+    dmx: don't dereference a nullpointer.
+
+commit 75eb635e3543fcb731331d01f50e62b696967667
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 3 22:25:33 2008 +0930
+
+    dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup
+
+commit 3ff2f3a00ef3c484d1d53569b6cbc1f25dc6bd35
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 3 22:17:14 2008 +0930
+
+    dmx: for now, don't acknowledge SDs.
+
+commit 5bcd9e8953dfb5f13e90baeebea1f6eac797644b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 3 22:01:43 2008 +0930
+
+    dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard
+
+commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 3 21:59:33 2008 +0930
+
+    dmx: claim we support XI 2.
+    
+    We don't really, yet, but at least we get the full device list this way.
+
+commit 6f1d5147cb394b7c83c4c1447c78890fa2b40a45
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 3 21:36:03 2008 +0930
+
+    dmx: fix a segfault caused by GC devPrivates never being initalised.
+
+commit d10ba4591a599a317093ffcbdd7cece11ab6de26
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 3 21:28:26 2008 +0930
+
+    dmx: some more build fixes.
+
+commit 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jun 5 09:19:16 2008 +0930
+
+    gl: include assert.h if we're compiling with DEBUG.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 8644aa47177bf20f3aa85181032ce75c08270fc5
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jun 5 08:55:09 2008 +0930
+
+    mi: minor build fix when compiling with debug enabled.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit fbf4b5f16ac23359872361c8c95a617fe8c92292
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 11:10:46 2008 +0930
+
+    dix: set dst->mapWidth when allocating a new map.
+
+commit ff3adf3e564d94fea18e48f966de40a7ded1279e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 11:10:11 2008 +0930
+
+    xkb: reset xkb_cached_map on CloseDownDevices.
+    
+    Could lead to some invalid pointers in the second server generation.
+
+commit 40855d8000b9b9f4e6c6b4317542378ecf516345
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 4 12:19:28 2008 -0700
+
+    XQuartz: Removed async debugging sleep
+    (cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d)
+
+commit ee86b751192b690973ee2a1446a406bc721ce8eb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 4 12:01:19 2008 -0700
+
+    XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
+    (cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e)
+
+commit 38da26cd36957a45b2a47ef124282f7d863a9fd3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 4 11:35:24 2008 -0700
+
+    XQuartz: Don't forget to destroy the mutex and cond after we're done with them
+    (cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72)
+
+commit ea40fcf4344c6e918d3be34354528940b05a70f3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Jun 4 11:18:52 2008 -0700
+
+    XQuartz: Fork for trigger
+    (cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
+
+commit 2393dae6ffff7db8281a7977039450e8754cc19f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Jun 3 00:06:26 2008 -0700
+
+    XQuartz: Switched over to new startup path for testing.  Cleaned it up a bit.  Server still crashes when using the icon to launch =/
+    (cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
+
+commit 45b661c67aca1a728f1793dd94d701488f1f196c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 4 13:39:39 2008 +0930
+
+    dix: Fix build with --disable-xinerama #16204
+    
+    X.Org Bug 16204 <http://bugs.freedesktop.org/show_bug.cgi?id=16204>
+
+commit 26e7e69ab893d1f2b35213250ada40ec90944f62
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 2 11:04:41 2008 +0930
+
+    kdrive: don't post motion event if there was no motion. #16179
+    
+    Based on the patch by Tomas Janousek.
+    
+    X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
+
+commit ac1db454497ff1839aa7f7ee0649ede112824ed9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 2 10:40:10 2008 +0930
+
+    xfree86: suspend signals while removing a device (corrected version).
+    
+    Block/Release is now symmetrical.
+
+commit 95ecaa411aefbcd8e2e00814132cb07b4be4e5bf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 2 10:38:45 2008 +0930
+
+    Revert "xfree86: suspend signals while removing a device."
+    
+    Left the signals blocked hanging after removing a master device.
+    
+    This reverts commit 74372fd0049676787904f1f9f80f836b97f5f60e.
+
+commit 5ba07cb54803b8c63e25e8ca1f1787860f684612
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Sun Jun 1 18:31:52 2008 -0300
+
+    kdrive: changes ephyr API according mpx merge.
+    
+    This fix host-cursor in Xephyr server.
+    
+    Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 5a3d06b8f42473cea3741dc722a775deaa2b73f6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jun 1 15:20:42 2008 +0930
+
+    xkb: delete default rules when devices are closed.
+    
+    We only have one set of default rules options in xkb. When the second keyboard
+    is brought up with Xkb options specified, these new options overwrite the old.
+    In future server generations, the rules used for the VCK are a mixture of the
+    default ones and ones previously specified for other keyboards. Simply
+    resetting the xkb default rules to NULL avoids this issue.
+    
+    Reproducable by setting XkbLayout "de" and XkbVariant "nodeadkeys". In the
+    second server generation, the VCK has "us(nodeadkeys)". This again produces a
+    SIGABRT when the first key is hit.
+    
+    I could not figure out why the SIGABRT happens. This patch is avoiding the
+    issue rather than fixing it.
+
+commit 5ebe76f13fb6e96cebe5a386024a73eceeb828ff
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 22:13:03 2008 +0930
+
+    config: init dev to NULL to shut up a valgrind warning.
+
+commit a7ae9cbd78193fdafcafd5d7af1f6fabbb434628
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 20:44:58 2008 +0930
+
+    dix: don't read valuators past numAxes.
+
+commit f79ad5674ed41c3626e8055cd2bac0135de928c6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 18:46:35 2008 +0930
+
+    kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr
+
+commit 58d12c99abc4d06cb8b43386d4bcd126f0bedf83
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 18:45:11 2008 +0930
+
+    mi: Remove #ifdef XINPUT, kdrive otherwise won't get events.
+
+commit 942086fc965fc9a24be2db4f537f0ff54db51083
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 18:17:49 2008 +0930
+
+    dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
+
+commit 6cecae0e8651b1fa58b3cd0e0a636db46f56f6a6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 13:12:53 2008 +0930
+
+    dix: Remove superfluous comment.
+    
+    This code can handle devices with < 2 valuators now.
+
+commit 105d28652d1fb80dd8ce8511e2605dccc8812e99
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 30 15:20:35 2008 +0930
+
+    Xext: use GPE/GKE from XTestFakeInput #16145
+    
+    This commit fixes two problems:
+    1) XTFI used to assemble the event itself, then passed it to the device. It's
+    much easier to just pass the variables into GPE/GKE and let the DIX do the
+    rest.
+    
+    2) XTFI would pass the VCP/VCK as default device to event processing. As a
+    result, updating LEDs would be updated on the VCK, not on the actual keyboard.
+    Instead, we now pass the events through the last-used SD, thus toggling the
+    LEDs on the last keyboard that sent through this MD.
+    
+    Also some cleanup in XTFI to merge validity checks a bit closer together
+    rather than having several different sections.
+    
+    This breaks XTestFakeMotion with Xinerama though.
+    
+    X.Org Bug 16145 <http://bugs.freedesktop.org/show_bug.cgi?id=16145>
+
+commit 341a61b608873c77b1a17fe7d145ed3ad716e5a3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 12:01:47 2008 +0930
+
+    mi: reduce noisyness. DebugF is enough if device ID can't be changed.
+    
+    Also - printing out the event type is actually helpful.
+
+commit 62c1a32976d571f3ced1812b8b96ed5a8e658b4a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 31 10:24:37 2008 +0930
+
+    dix: null out dummyDev, otherwise Xephyr dereferences random pointers.
+    
+    SendEventToAllWindow eventually causes a IsInterferingGrab(), which attempts
+    to dereference dev->deviceGrab.grab.
+
+commit 150c2f55a508ed24b230f68e30ec140c0901d9ae
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri May 23 03:09:04 2008 +0200
+
+    Add xkbstr.h and xkbsrv.h to sdk_HEADERS
+
+commit f9bcecbe51e4cf0cb2d82ad953f8c6741ed5558b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 29 17:42:49 2008 +0930
+
+    Xext: only free events in case of core motion events.
+
+commit 8cf7755a85f5c1e5da7805c12b7511581a368782
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 28 18:05:25 2008 +0930
+
+    Require x11proto 7.0.13, xextproto 7.0.4 and inputproto 1.9.99.1
+
+commit 9b544fa40062b342ff3aa75f8f21d0bd4cec80ab
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 28 12:27:07 2008 +0930
+
+    mi: ansify.
+
+commit 64677f6a167a5bee99e5dfb599a3c3a6fb5dffe7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 27 21:01:26 2008 +0930
+
+    xfree86: fix offset error in EDID parsing. #15964
+    
+    X.Org Bug 15964 <http://bugs.freedesktop.org/show_bug.cgi?id=15964>
+
+commit c8af7ce35a900ac9b898f51c1b95dabad3ba1d76
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Fri May 23 13:50:39 2008 -0300
 
@@ -1836,27 +11614,132 @@ Date:   Fri May 23 13:50:39 2008 -0300
     and the XFree86-VidModeExtension extension is used.
     
     Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
-    (cherry picked from commit c8af7ce35a900ac9b898f51c1b95dabad3ba1d76)
 
-commit 1667ed6e2474c274d6cf9cdbd83518450dea4d44
+commit 3a1278907ea8059546c7b9ab0c02714832c693e3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 26 18:01:07 2008 +0930
+
+    xfree86: Bump XINPUT ABI to 3.0.
+
+commit 0050165a67bb462e0bf644a11644ad9d587c62bb
+Author: Simon Thum <simon.thum@gmx.de>
+Date:   Mon May 26 17:56:08 2008 +0930
+
+    input: change dxremaind, dyremaind to floats for better acceleration #9156
+    
+    X.Org Bug 9156 <http://bugs.freedesktop.org/show_bug.cgi?id=9156>
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709
+Merge: 5fe5778 2958610
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 26 17:37:31 2008 +0930
+
+    Merge branch 'master' into mpx
+
+commit 5fe57787faa2ea4f2f57b25455d200bf924206d6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 26 17:23:34 2008 +0930
+
+    dix: store the absolute values in the motion history.
+    
+    The core protocol requires absolute values and it's a bit hard to get them if
+    we only have relative ones in the history. Switch the motion history to
+    absolute, and if we really need the relative values, we can probably generated
+    them from the abs. ones in the future.
+
+commit 1883485edd7eb90c0b76bca41c71e26ae2c0b91a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 26 16:35:23 2008 +0930
+
+    If core motion history is required, scale back to screen coords and INT16.
+
+commit 0b88510069bdf6d020d73b424f62c2923c0db4a4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 26 13:53:45 2008 +0930
+
+    Ensure the motion history is merged for master devices.
+    
+    Add each event to the master's MH as well as to the SDs. In the MD, store
+    min/max and the actual value. When retrieving the MH, rescale all coordinates
+    to the current coordinate range and only post those valuators that are
+    currently active on the device.
+
+commit d22c25bda450f6f1dfa634f0f72b32c4bec429cd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 26 09:26:18 2008 +0930
+
+    dix: Allocate MD's motion history to be large enough for potential valuators
+    
+    Since we can't predict how many valuators may be in a future SD attached to an
+    MD, we need to preallocate a history buffer that is large enough to keep
+    MAX_VALUATORS coordinates per event.
+    
+    In addition, the history buffer needs to memorize the coordinate ranges at the
+    time, thus requiring MDs to store (min_val, max_val, current_val, time)
+    instead of (current_val, time) for each motion history entry.
+    
+    This commit only fixes the allocation.
+
+commit 0877de13ac6ddfb55108aa3456d47f970c6c442c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun May 25 22:49:54 2008 +0930
+
+    Remove GetMotionProc from ValuatorClassRec.
+    
+    With the MD/SD device hierarchy we need control over the generation of the
+    motion history as well as the conversion later before posting it to the
+    client. So let's not let the drivers change it.
+    
+    No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping
+    it seems safe enough.
+
+commit 00b4339168c10dd4ce026deb8e04bfb63dfd11dc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun May 25 22:34:11 2008 +0930
+
+    dmx: remove some #if 0'd code.
+
+commit 096117cf023dc92dcadc91677931fc6ad1feb4a0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun May 25 10:38:33 2008 +0930
+
+    Xi: reset motion history when swapping device classes.
+    
+    This isn't really the correct solution, but it'll have to do until I figured
+    out how to transfer the history over correctly.
+
+commit 29586101dc11d498b212510f8dedbfeca7f8c859
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Sat May 24 20:01:41 2008 +0200
+
+    EXA: Only record damage generated by rendering operations.
+    
+    Recording damage from other operations (e.g. creating a client damage record)
+    may confuse the migration code resulting in corruption.
+    
+    Option "EXAOptimizeMigration" appears safe now, so enable it by default. Also
+    remove it from the manpage, as it should only be necessary on request in the
+    course of bug report diagnostics anymore.
+
+commit f6d61d3d86971d6a202b46ff2fab8c8799a4d057
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Sat May 24 20:01:36 2008 +0200
 
     EXA: Don't migrate twice in exaImageGlyphBlt.
     
     exaPrepareAccess already handles migration.
-    (cherry picked from commit f6d61d3d86971d6a202b46ff2fab8c8799a4d057)
 
-commit 6dee3fdf18f618dea034ad3b5cb028da0fb51639
+commit d73304398255e0c3b03a497a8d4a2f8d900eef44
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Sat May 24 20:01:31 2008 +0200
 
     EXA: Don't suggest exaCopyDirty be inlined.
     
     Leave the decision to the compiler toolchain.
-    (cherry picked from commit d73304398255e0c3b03a497a8d4a2f8d900eef44)
 
-commit 3943a3a567c76aa3aee2ffe577e8d1d8c2c0f26b
+commit 3baf3b42e079b4e7b61c1e20df305db0724d21f8
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Sat May 24 20:01:21 2008 +0200
 
@@ -1864,114 +11747,383 @@ Date:   Sat May 24 20:01:21 2008 +0200
     
     Avoids excessive migration overhead in some pathological cases. See
     http://bugs.freedesktop.org/show_bug.cgi?id=15845 .
-    (cherry picked from commit 3baf3b42e079b4e7b61c1e20df305db0724d21f8)
 
-commit c00ff932f88f497dd638662c151ea63ffbc8bed1
-Author: Drew Parsons <dparsons@debian.org>
-Date:   Fri May 9 23:20:11 2008 +1000
+commit ba557e0263eee0b75847c596f31c71492611b22c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat May 24 17:23:10 2008 +0930
 
-    Disable D-BUS from Xprint.
+    Xi: remove deprecated comment.
     
-    Use dummy config functions to replace those from config/config.c, and
-    therefore do not link Xprt with $CONFIG_LIB.
+    Axis clipping wouldn't be necessary here, it's already performed in GPE.
+
+commit e6cbb1e11e5da1a8b9001853c25f4e5a052e7110
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri May 23 23:00:40 2008 +0200
+
+    xfree86: fix build on GNU/kFreeBSD
     
-    Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
-    (WaitForSomething() not waiting) when built with dbus, which was
-    causing Xprt to use 95% cpu.
-    (cherry picked from commit 2a3d1421e0cc18822ae8f478fcc272e16a9e9340)
+    GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
+    Unify preprocessor conditionals between variable declaration and use.
+    Debian bug #482550.
 
-commit 2f994cb00e9b6d0e8362b9d777091dd673960d53
-Author: Drew Parsons <dparsons@debian.org>
-Date:   Mon Mar 10 22:54:49 2008 +1100
+commit 6c72961d8fa1ab1543f1b3e2cc7d34ff6d254bf8
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri May 23 22:39:35 2008 +0300
 
-    Create dix/libXpdix.la for Xprint-specific build of libdix.la
+    glx: fix memory corruption with r5g6b5
     
-    (cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)
+    should cherry-pick to xserver-1.5
+
+commit 21a8052fdca2115668dfc747b0b58db437b4eb6d
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri May 23 22:39:09 2008 +0300
+
+    glx: fix forgotten swrast -> SWRast
+
+commit 877e6c35ff1f0f110627590ac0f12fddf47de506
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri May 23 22:38:36 2008 +0300
+
+    glx: missing swrast is fatal
+
+commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri May 23 22:38:11 2008 +0300
+
+    glx: drop stray glcore.h include
+
+commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri May 23 22:40:03 2008 +0300
+
+    kdrive: need not export symbols for glx anymore
+
+commit 7082929ef7db20b507dce5a8cec043e787d0b55e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 23 02:27:58 2008 -0700
+
+    XQuartz: A 2 second delay for launchd socket connections should be sufficient.
+    (cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
+
+commit 5a388b27a094c71b4214aa744b2ba0fdda7fd607
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 23 02:10:14 2008 -0700
+
+    XQuartz: Add the launchd fd to AllSockets as well
+    (cherry picked from commit 83f72529394be5871671d73b6ef4f8bc83708f8a)
+
+commit 77b688a73025238ed9fe286a2bae8f78da65fce3
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 23 02:32:28 2008 -0700
+
+    XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code.
+    (cherry picked from commit 1e1f4fb717d2f3a3227be2a034d28d6a4f29b5d1)
+
+commit 225dddbaeded4d64fcc104da538449e5c4dedd2d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 23 01:39:02 2008 -0700
+
+    XQuartz: Move the launchd display grabbing into mach_startup
+    (cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
+
+commit 3a22190061c7ebefee85564b0def5e1112c07ae8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 19 03:13:09 2008 -0700
+
+    XQuartz: Fixed a few issues with fd passing... still not working =(
+    (cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa)
+
+commit 3ae0f4fc832462444d03024c5fbb867f19d5e960
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 15:02:43 2008 +0930
+
+    dix: update valuators > 2 as well.
     
-    required because of commit 7c0709a736c0f3aa011de67dd2c2962585ab146e,
-    which made requestingClient in dix specific to Xprint only.
-    Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
-    $(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.
+    master->last.valuator[x] for x > 2 is undefined. For all other devices, it's
+    the respective device's last valuators.
     
-    Follows 571206832d454771e3c638c7515767958365c19c (providing -DXPRINT
-    to xprint subdirs).
+    If the lastSlave did not have a valuator that is to be updated now, it is
+    reset to 0.
+
+commit 0d1b41ace38bc918e2cc2a0a6ad107c76346fd00
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 13:32:33 2008 +0930
+
+    Xi: update device valuators based on the event.
     
-    Note it may be possible to restructure the code so that
-    requestingClient is stored elsewhere than in dix. See discussions
-    following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
-    If this is done it may be possible to revert this commit (if not 571206...).
-    (cherry picked from commit 966ae1781f3ca563e15a9a1b8cab6fab94e07fe9)
+    Event is always absolute, update the device's valuators (always absolute too),
+    and then change the deviceValuator event to reflect the device's reporting
+    mode.
 
-commit 30774d6b3cde6deda7a21ad25e396449fb791237
-Author: Drew Parsons <dparsons@debian.org>
-Date:   Mon Mar 10 13:48:05 2008 +1100
+commit 7eec1c23a34591064ea64499acb24f22ada08dfa
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 13:23:02 2008 +0930
 
-    Define XPRINT in XPRINT_CFLAGS (configure.ac)
+    dix: don't allow relative data in deviceValuators.
     
-    -DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
-    After commit 7c0709a736c0f3aa011de67dd2c2962585ab146e it is also
-    required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
-    defined, so make it a global Xprint definition in configure.ac.
-    (cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
-    (cherry picked from commit 571206832d454771e3c638c7515767958365c19c)
+    In GPE, we don't care about the device mode. Let's put the absolute values
+    into the deviceValuator event and worry about relative valuators on the other
+    side of the EQ.
 
-commit 200d676be2de8d83899420655efe870ac0b61d24
-Author: Tilman Sauerbeck <tilman@code-monkey.de>
-Date:   Mon Apr 21 11:22:07 2008 +0200
+commit 75551a2ef949c2cfb53fdc4b97f3964a5e2f45f5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 12:55:50 2008 +0930
 
-    EXA: Set pixmap->accel_blocked on the screen pixmap, too.
-    (cherry picked from commit 3f081b4de55e1378728a24d069bf06575ffca2d8)
+    Revert "dix: Correct values in the device axisVal are calculated in GPE"
+    
+    We can't rely on GPE to update device->valuators->axisVal. If a SIGIO occurs
+    during event processing this may have incoherent results.
+    
+    This reverts commit f6645ddbf754c80e9a8b1672519534a887622270.
 
-commit 2df83b491e87b27a3bba2fd874afe74a6af7e2cc
-Author: Tilman Sauerbeck <tilman@code-monkey.de>
-Date:   Mon Apr 21 11:03:27 2008 +0200
+commit fe59b1a62b2c7f467d20132db4913317bbf308eb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 12:51:52 2008 +0930
 
-    EXA: Update sys_pitch/fb_pitch in exaModifyPixmapHeader.
+    dix: more device scaling insanity.
     
-    exaModifyPixmapHeader now also only evaluates arguments that have a
-    meaningful value.
-    (cherry picked from commit 26c1801a27b81fdd988d5bd210ba0e76ecc274ae)
+    Assuming master->last.valuators is in screen coords, SD's are always in device
+    coordinates.
+    
+    1. If an event comes in, scale masters->last to the device, drop into device's
+    last->valuators.
+    2. Apply motion from the actual event
+    3. Scale back to screen coords, check if we may need to cross screens
+    4. Drop screen coords into master->last
+    5. Rescale to device coords, drop into deviceValuator event and SD->last
+    6. Drop screen coords into ev->root_x/y
+    
+    Whoopee...
 
-commit 0fba91a5324662c10d15bc0e41cc8737c51340bb
-Author: Michel Dänzer <michel@tungstengraphics.com>
-Date:   Mon Apr 21 10:45:11 2008 +0200
+commit 6c9e9f8a40e20fb1761440acd2755f5fd31f4d44
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 11:51:53 2008 +0930
 
-    EXA: Offscreen memory eviction improvements.
+    input: instead of lastx/y, use a last.valuators[] array on the device.
     
-    * Make sure available areas are considered to have no eviction cost. This seems
-      to help for https://bugs.freedesktop.org/show_bug.cgi?id=15513 but I'm afraid
-      that may just be coincidence.
-    * Only calculate eviction cost of each area once for each eviction pass.
-      Safeguard against potential (though unlikely) division by zero.
-    * Cosmetic enhancements: Name eviction cost related variables 'cost' instead of
-      'score' to emphasize that smaller values are better, update Doxygen file
-      comment to the way eviction works now.
-    (cherry picked from commit 6c95fae1e9d6b0eb64bc78eced05a6e9f5faf02e)
+    During GetPointerEvents (and others), we need to access the last coordinates
+    posted for this device from the driver (not as posted to the client!). Lastx/y
+    is ok if we only have two axes, but with more complex devices we also need to
+    transition between all other axes.
+    
+    ABI break, recompile your input drivers.
+
+commit fb146cbb0f28e4e480e5d16d61476ac46b5d00ce
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 23 12:00:13 2008 +0930
+
+    dix: coreEvents doesn't have meaning here, use master instead.
+    
+    We mustn't clip x/y if we are attached, otherwise we can't change screens.
+
+commit fc1cc0adcb91fdfa4c547bf379a85f9558c959ff
+Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
+Date:   Fri May 23 00:33:18 2008 +0200
+
+    dix: Cleanup of GetPointerEvents
+    
+    Changed all the checks for x&y valuator so the more complex
+    calculation is only made once.
+    Added TODOs for valuator/axis 2 and above for future correct
+    handling of relative reporting of these.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit a0241d5380bb5d8b10865f8ea81a9a011de4aaf1
+Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
+Date:   Fri May 23 00:36:11 2008 +0200
+
+    dix: Correct clipAxis so it can handle devices with value ranges properly
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit f6645ddbf754c80e9a8b1672519534a887622270
+Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
+Date:   Thu May 22 23:33:45 2008 +0200
+
+    dix: Correct values in the device axisVal are calculated in GPE
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 7f85acdf70c67c567de688439e25081be5a7d5df
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 22 23:27:15 2008 +0930
+
+    dix: fill valuators with the correct values depending on the device mode (GPE)
+    
+    valuators[] is passed from the DDX. Depending on the device mode, update it
+    with either absolute values or relative values. The deviceValuator event sent
+    to the client will then contain the respective values.
+
+commit 1a3f351c50cba66f71a73239318174b09fd9b63b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 22 23:25:20 2008 +0930
+
+    dix: when floating a device, create a new cursor sprite.
+    
+    This is essentially necessary to allow calls to miPointerGetSprite etc. to
+    work for floating slave devices.
 
-commit 50e77eb8384b8d9c569ef3726bb7f4abf43b2af8
+commit e0fbe404a436aef24624a3a15e8405a9ca38aadb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 22 23:24:29 2008 +0930
+
+    mi: handle sprite even for floating slave devices.
+    
+    We still don't render it, but we accept all the other calls to update it's
+    internal state.
+
+commit 0f15875a271889ae3cc4997ad15f787ea28b3a08
+Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
+Date:   Sat May 17 19:24:00 2008 +0200
+
+    Make all conversion handling in GPE.
+    
+    This isn't quite finished yet, but at least it gives us the ability to use a
+    tablet as a normal mouse - with all the scaling in place.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 74372fd0049676787904f1f9f80f836b97f5f60e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 22 18:02:10 2008 +0930
+
+    xfree86: suspend signals while removing a device.
+    
+    Getting a keyboard event while halfway through freeing memory can be
+    unpleasant.
+
+commit 30e9a33f7d1972dcf1c29c7455b2cea4e5857913
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 22 16:00:21 2008 +0930
+
+    xkb: fix crash caused by uninitialised variable.
+
+commit e837244947fbb18192e9056c070ce439ef24d1a3
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Wed May 21 16:14:55 2008 -0700
+
+    Actually enable building GLX without Mesa source
+
+commit ea4ec9e9983e25d94a3edf8a77ed2ad1db193284
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue May 20 13:59:09 2008 +1000
 
     int10: add pci_device_enable support on Linux
-    (cherry picked from commit ea4ec9e9983e25d94a3edf8a77ed2ad1db193284)
 
-commit 77313bdc76b2dc4e9992432379e8d54a99d27d1f
-Author: Aaron Plattner <aplattner@nvidia.com>
-Date:   Mon Jun 9 09:52:04 2008 -0700
+commit 4230b92744d54528f48ddc3b096a265b488053c9
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed May 21 17:58:15 2008 -0400
 
-    CreateColormap returns Success on success, not TRUE.
-    
-    Fixes a problem where enabling color index overlays disables the RENDER
-    extension.
-    (cherry picked from commit 607b0d09ea003f87cfb3331e59e13495a483832a)
+    Clean up remaining afb references.
 
-commit 9211a10b981008fb96f09d6933345e41a0872f2a
+commit 20ea99c655140e101f2d20cfab78fb22765fec62
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed May 21 17:52:23 2008 -0400
+Date:   Wed May 21 17:03:25 2008 -0400
+
+    Death to afb.
+    
+    Planar framebuffer people, please talk to wfb for all your 1988 hardware
+    needs.
+
+commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Wed May 21 10:51:15 2008 -0700
+
+    Fix up paths for GL/glx -> glx renaming
+
+commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed May 21 13:33:36 2008 -0400
+
+    Move GL/glx on level up now that it's the only thing left under GL.
+
+commit a8a9b40e554dd0c184866978889a39519afc466a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed May 21 12:34:07 2008 -0400
+
+    Move the windows GL files to the xwin DDX.
+
+commit e5aad4bc087036489e2af576628aa9b612054a6e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed May 21 11:44:12 2008 -0400
+
+    Get out of the mesa symlinking business.
+    
+    This copies over the files generated from mesa/src/mesa/glapi.  There's
+    a corresponding mesa commit that makes it easy to generate the glapi files
+    straight into the xserver tree when the XML definitions change.
+    
+    The only few files that are copied from mesa but aren't generated are
+    glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
+    driver API and the whole setup is still a bit fragile, but it's not a new
+    problem.
+    
+    The --with-mesa-source configure option is still around since other
+    parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
+    but for common case of building with GLX and AIGLX support, that
+    option is no longer needed.
+
+commit f558c7d4d1d87affe1ce4aec2e62ff64545f2bc8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed May 21 10:18:16 2008 -0400
 
-    xserver 1.4.99.902
+    Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
+
+commit 77ff8fd5072fa57158463bfd84656389eeb7b503
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed May 21 10:17:53 2008 -0400
+
+    Drop glcore GLX provider.
+    
+    Obsoleted by the DRI swrast driver.
+
+commit 61eaef22359ae2abcee7dcd73ee8610a83776fc7
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Tue May 20 16:56:27 2008 -0400
+
+    Stop symlinking glcontextmodes.[ch] from mesa.
+
+commit 88f43e5d06fb5543bc40ca060b2c5d8e2673afad
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Wed May 21 18:13:47 2008 +0300
+
+    glx: drop drm.h, sareaHandle from swrast loader
 
-commit b69c74d14b7a777ae02aee0a8ff81efbff8cca6e
+commit 255142b61eb73843b16c2afdb95aa4d1f27e4f0d
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Thu Jan 3 17:53:56 2008 +0200
+
+    drop xprint remnants: InitGlobals
+
+commit 641ce9c706ce3cbf726fb3fc9623161bb96ba127
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Thu Jan 3 17:28:04 2008 +0200
+
+    drop xprint remnants: xpstubs
+
+commit 5c5a1eaf68eb11053fd5b99d24eb8024b6d5b218
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 21 21:51:27 2008 +0930
+
+    Replace UniSA with full Uni name in Author affiliation.
+    
+    Big boss says UniSA isn't unique enough. Who am I to argue?
+
+commit 7509fb498c02fe1cebe4139612b8871ec877c130
+Merge: 2ae3bed dfb7de6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 21 16:25:35 2008 +0930
+
+    Merge branch 'hwcursor' into mpx
+
+commit 2ae3bed33731d800bb28a968e3a1c8066d179740
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 21 15:51:35 2008 +0930
+
+    mi: shut up compiler warning (return w/o a value)
+
+commit 8b3d26f5b6caff1766669deb0e2100d2dee3f185
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Tue May 20 12:39:28 2008 -0700
 
@@ -1979,9 +12131,63 @@ Date:   Tue May 20 12:39:28 2008 -0700
     
     This allows using PanoramiXTranslateVisualID to test whether a given visual made
     it through PanoramiXVisualConsolidate.
-    (cherry picked from commit 8b3d26f5b6caff1766669deb0e2100d2dee3f185)
 
-commit 5efe36f7afde8b5bf4e853dd1dde2a6a027d613b
+commit 6ff6465931c397f72db27a4fd0ca0dcac0609537
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Tue May 20 16:36:22 2008 -0400
+
+    Add loader for the swrast dri driver.
+
+commit 4056595fc77c20052e226b402e38a2a914dca123
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 20 18:57:31 2008 +0930
+
+    xkb: remove superfluous checks in if statement.
+
+commit 925e895b869e461a9e7f135891463c56ee633cd6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon May 19 18:43:29 2008 -0700
+
+    Restore return type on xf86SetScrnInfoModes
+    
+    Seems to have been accidentally lost by commit 	76943fec860315f3c93539e59a59080b8a7b3e75
+
+commit 7a550cefd9417c22a4397ea4d103ddc347ab1a0f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 20 11:07:39 2008 +0930
+
+    dix: shut up two compiler warnings.
+
+commit f9edecd1b53a2e234def9cbd954a47c4bda2bebc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 20 11:07:17 2008 +0930
+
+    mi: sync declaration and definition of mieqResizeEvents.
+
+commit e73a03d589b47ac9131f3932da7f78d2fef7bfb5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 20 10:54:32 2008 +0930
+
+    fb: shut up two compiler warnings.
+
+commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958
+Merge: fc7e256 0178b6a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 20 10:20:14 2008 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xext/xprint.c (removed in master)
+    	config/hal.c
+    	dix/main.c
+    	hw/kdrive/ati/ati_cursor.c (removed in master)
+    	hw/kdrive/i810/i810_cursor.c (removed in master)
+    	hw/xprint/ddxInit.c (removed in master)
+    	xkb/ddxLoad.c
+
+commit 0178b6a4abed0df3e90ba393709ed566105e7c2c
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon May 19 11:22:19 2008 -0400
 
@@ -1991,48 +12197,129 @@ Date:   Mon May 19 11:22:19 2008 -0400
     config file setting), then remove RB modes from the default pool.  Any
     RB modes from the driver and config file pools will stick around though;
     you asked for them, you got them.
-    (cherry picked from commit 0178b6a4abed0df3e90ba393709ed566105e7c2c)
 
-commit e644d2e73f72e7a3e1a9525bdde0de2012efec59
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Mon May 12 03:03:13 2008 -0400
+commit bb687465d0c5aef3cc1c865e6ea67c01a8b417fb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 19 02:45:47 2008 -0700
 
-    Prevent the -wm command line option from causing a SEGV
-    
-    The -wm (when mapped) option for the BackingStore support has been
-    causing the server to dereference a NULL pointer.
-    
-    This has probably been the case since backing store has been
-    implemented on top of Composite.
-    
-    It looks like (some of?) Composite didn’t expect its WIndowPtr
-    argument to be the root window.
+    XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
+    (cherry picked from commit cccee9cfc29f85cca635df3b8dd54199b45c4df8)
+
+commit 4b69d22bcb79210225379da2cefb0cd8d5ffa10e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun May 18 23:51:06 2008 -0700
+
+    XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
+    (cherry picked from commit 2a72309c061f7060480d150791019ce232481462)
+
+commit e997df8cd3c4222ea9fc3f0ebda728c4d1f15df5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun May 18 23:31:41 2008 -0700
+
+    XQuartz: Cleaned up ListenOnOpenFD...
+    (cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
+
+commit 738672858d9399ecbc170500c15f90bf657502d2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun May 18 23:02:12 2008 -0700
+
+    New XQuartz icon thanks to Simone Karin Lehmann
+    (cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
+
+commit 4be2104c801340075e030d06d24ceb4d8a6d6549
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 15 12:26:32 2008 -0700
+
+    XQuartz: More work towards Mach-IPC startup... started working on FD passing
+    (cherry picked from commit 27fbfeacfa16d620801ac3492b25c1e50aec8588)
+
+commit 82c4075d4ba3bea03341c80b754b0f9d2f62a826
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Mon May 19 03:15:11 2008 +0200
+
+    xfree86: fix initial output positions with Above or LeftOf and rotation
     
-    In Composite’s compCheckRedirect() function we now avoid calling
-    compAllocPixmap() and compFreePixmap() when the pWin pointer’s
-    parent member is NULL, as is it the case with a server’s root window.
+    The fix in fa19e84714aa84a2f2e817e363d6440349d0b619 was incomplete,
+    as it was still using the wrong output's initial rotation to compute
+    the position.
+
+commit 7dca84f3ee7265119fb81d598d7d2f7363e25f1f
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon May 19 11:16:08 2008 +1000
+
+    cursor: don't dereference NULL pointer is devPrivates not yet set.
     
-    This addresses:
+    This fixes a bug on server recycle with ati zaphod.
+
+commit 5af5db5033582a84b616d5c50f4288adb0210459
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat May 17 14:51:09 2008 -0700
+
+    XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
+    (cherry picked from commit 301262b07024ad960f22d99a1267fe137f5c3fce)
+
+commit 2408303d79297385063cae557195bd5fd3698478
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat May 17 14:56:53 2008 -0700
+
+    XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
+    (cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
+
+commit 01612fe612aa27262fc3c8167f52e0376941f1ef
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 15 07:08:21 2008 -0700
+
+    XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
     
-    https://bugs.freedesktop.org/show_bug.cgi?id=15878
+    Need to setup configs for the quartz keyboard
+    (cherry picked from commit c28fecc621b1803a4d4536afbc724d141de9e6ee)
+
+commit 1d09deaa6e5a75420ea4f24f6b5533f0ebc3ba28
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 15 05:49:43 2008 -0700
+
+    XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
+    (cherry picked from commit 5626b0949b1a6bdd2fa3ec2ef53a688084349b87)
+
+commit adc62f62b9f08aa6633718989ab61b61e3c1e8e2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed May 14 01:33:43 2008 -0700
+
+    Xquartz: Xquartz stub now can send Mach IPC to start the server.
+    (cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
+
+commit 93c082a060bfa8d2a204c0c57ec3507a8edea087
+Author: Brad Smith <brad@comstyle.com>
+Date:   Sat May 17 13:14:31 2008 +0200
+
+    OpenBSD doesn't define __x86_64__, simplify tests.
     
-    (cherry picked from commit 04211c3532ca078420e3745a5eac3d9de120bc32)
+    Seeing as this code seems to be specific to OpenBSD I don't think
+    __x86_64__ should have been added there at all. It appears to have
+    been added wherever __amd64__ existed before which is wrong. I
+    think that part of the commit should be reverted but also all four of
+    the checks should be __OpenBSD__ && __amd64__ instead of two one
+    direction and two flipped.
 
-commit 0230f39fa3b3076b7694b6443a7a3ad8f63f7b55
+commit 895d4e274d2b4638f0e6838dfee0e543311dba34
+Author: Brad Smith <brad@comstyle.com>
+Date:   Sat May 17 13:05:58 2008 +0200
+
+    BSD's also have /dev/urandom.
+
+commit aad1c37b0951eae216ac323c5d8bfc6fbcf096bd
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri May 16 10:52:41 2008 -0400
 
     RANDR 1.1 compat: remove senseless comparison against the virtual size.
-    (cherry picked from commit aad1c37b0951eae216ac323c5d8bfc6fbcf096bd)
 
-commit 95985256efa7e86cefe4b1541780eda12c0c8f89
+commit 14726b776d6cebb7d864b6ffa7554e1ce5637d5c
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri May 16 10:51:32 2008 -0400
 
     xf86SetDesiredModes(): Skip disabled CRTCs first thing.
-    (cherry picked from commit 14726b776d6cebb7d864b6ffa7554e1ce5637d5c)
 
-commit bedcf985580e7d6684ee9079fe955b6a7e49ad48
+commit 459f34b089aca4f4eee9752600c3a9e4f4e343ab
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri May 16 10:48:00 2008 -0400
 
@@ -2041,9 +12328,8 @@ Date:   Fri May 16 10:48:00 2008 -0400
     The first guess used to be "is the preferred mode for one output the
     preferred mode on all outputs".  Instead, do "find the largest mode that's
     preferred for at least one output and available on all outputs".
-    (cherry picked from commit 459f34b089aca4f4eee9752600c3a9e4f4e343ab)
 
-commit bd50c41f6f479822ec595e02b3ae7a2f6060ba06
+commit 96111c154713600dd534dd82104ac18b91466202
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri May 16 10:31:58 2008 -0400
 
@@ -2052,67 +12338,329 @@ Date:   Fri May 16 10:31:58 2008 -0400
     Old logic was just the first one that happened to have an associated
     CRTC.  The new logic tries to find one that's definitely connected, has
     probed modes, and has the largest candidate mode.
-    (cherry picked from commit 96111c154713600dd534dd82104ac18b91466202)
 
-commit 0b031442fe7a04ac8c935ab5858854436f3f3d3c
+commit a4bbe1c8bca08f3df5ff7e50444af6aef7ec8b25
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri May 16 10:25:12 2008 -0400
 
     Re-add sync range inference from legacy setup to RANDR 1.2.
-    (cherry picked from commit a4bbe1c8bca08f3df5ff7e50444af6aef7ec8b25)
 
-commit b053c9768bca21e8df0df37f45465e2e14bc00fc
+commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Apr 9 13:55:25 2008 -0400
+Date:   Mon May 5 14:37:07 2008 -0400
 
-    Default X-SELinux to off.
+    Fix hal shutdown crash.
     
-    Applied only to 1.5 branch for purposes of release stability.  Reevaluate
-    this when we do 1.6.
+    Removing the device invalidates its ->next pointer.  Copy it aside before
+    destroying the device.
 
-commit cfff55a2bb8618867513bd0f3e66d131ed4edaa8
+commit 99e4531f7c3fafce065dfd21f65bad1cf190c3f1
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon May 12 14:53:37 2008 -0400
+Date:   Fri May 16 08:16:01 2008 -0400
 
-    Fix fbdevhw initialization for PCI drivers.
+    The great kdrive purge.
     
-    graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
-    (cherry picked from commit 86678e7cc2b021851ff508433fa160170f500c51)
+    Most of these drivers didn't work.  ati was the only one that even came
+    close.  The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
+    and vxworks directories have never built since modularisation, so clearly
+    no one can miss them.
+
+commit fc7e2566cc076c0d979f74871bc436df43401058
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 16 16:59:34 2008 +0930
+
+    Xext: fix typo in condition.
+    
+    Fall-out from dc3aba8a559d4304844ee1cc306c577a63b82762.
+    We must free the event if it is NOT an extension event.
+
+commit 6fb76acc4524d6af4bfb6bc6d862c1ee2bbb8baa
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 16 19:22:32 2008 +0930
+
+    mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
+    
+    In the xnest and vfb DDX we don't need the call anyway, it's performed by
+    mieqProcessInputEvent.
 
-commit 1bd229d4ac36eaebf921a9b3526acd947ca0bfaf
+commit dfb7de6571345061d1cd88ab915064fc376529fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 16 20:56:04 2008 +0930
+
+    mi: don't call from miPointerMoved into the spriteFuncs for anything but VCP.
+    
+    Calling ->MoveCursor for anything but the HW-rendered VCP causes the
+    SW-rendered cursor routines to be started, including mallocs, etc. Since
+    miPointerMoved is called during SIGIO, this is a bad idea.
+
+commit f611719edce2ae51dca8e53947a3938b53c20b00
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 16 19:49:29 2008 +0930
+
+    xfree86: always render first cursor in HW, all others in SW.
+
+commit 48ba58feacedf9781db81c82adbb37197d9a5cd1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 16 19:22:32 2008 +0930
+
+    mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
+    
+    In the xnest and vfb DDX we don't need the call anyway, it's performed by
+    mieqProcessInputEvent.
+
+commit 622d7c1d899a6146773a2ebd1d632a805f24025e
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed May 14 14:49:09 2008 -0300
+
+    Restructure and organize the code.
+    
+    It was removed and simplified some conditionals. We don't need test for
+    pDev->isMaster inside xf86CursorSetCursor() because only MD enters there.
+    
+    In the last chunk, ScreenPriv fields were being assigned without need, so
+    that code was wrapped inside the conditional to avoid it.
+    
+    I also tried to make the identation more sane in some parts that I touched.
+    
+    Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+    
+    Minor modification, part of the original patch led to cursors not being
+    updated properly when controlled through XTest.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 5af90025fee6a92e7d94642978feed21f902d0cb
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed May 14 02:45:49 2008 -0300
+
+    Remove redundancy.
+    
+    The only function that cat set SWCursor before xf86DeviceCursorInitialize()
+    is xf86InitCursor() when VCP and is created.
+    
+    Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 9fc94edfe3df4c4a84ad70714c0a4ef8bbf57fc9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 16 16:59:34 2008 +0930
+
+    Xext: fix typo in condition.
+    
+    Fall-out from dc3aba8a559d4304844ee1cc306c577a63b82762.
+    We must free the event if it is NOT an extension event.
+
+commit 5127942f80983b2e053dddd5c5747d0c3d2f9d6d
+Author: Brian Rogers <brian_rogers@comcast.net>
+Date:   Fri May 16 10:08:04 2008 +0930
+
+    DGA: pass nevents to UpdateDeviceState. #15936
+    
+    Missing parameter caused event processing to go nuts when checking valuators.
+    
+    X.Org Bug 15936 <http://bugs.freedesktop.org/show_bug.cgi?id=15936>
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 28378d26b4bae377ef1212f6a51cda9b5529f1b5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 15 11:09:15 2008 +0930
+
+    Xi: assemble button/modifier state before updating the device. #15934
+    
+    The state field of the event must specify the state of the devices before the
+    event occured. With the code as it was, the state would also include the
+    event (e.g. state from a button press event would show the button as pressed)
+    Gathering the state before updating the device should fix this.
+    
+    X.Org Bug 15934 <http://bugs.freedesktop.org/show_bug.cgi?id=15934>
+
+commit 7cabf81c8638739a15a1be6baa3fc569f38e7589
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu May 15 13:24:27 2008 -0700
+
+    Add necessary include for COMPILEDDISPLAYCLASS.
+    
+    Fixes build after 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0.
+
+commit 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon May 5 14:37:07 2008 -0400
+Date:   Wed May 14 16:07:51 2008 -0400
 
-    Fix hal shutdown crash.
+    Move defaultDisplayClass to xdmcp-only visibility.
+
+commit 166177e36bfc7bd1df03663ad89500cff056d563
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed May 14 16:02:05 2008 -0400
+
+    Simplify default font path setup.
+
+commit 2efe1abb6fc786a4f86464978ae0d23fc7347a98
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed May 14 15:53:11 2008 -0400
+
+    Remove global argc/argv variables.
     
-    Removing the device invalidates its ->next pointer.  Copy it aside before
-    destroying the device.
-    (cherry picked from commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d)
+    Was only used in the logging code anymore, and uselessly so there.
 
-commit 18a1d643bc82f15ad26059e2a479f5d5dd778343
-Author: Hans de Goede <j.w.r.degoede@hhs.nl>
-Date:   Wed Apr 23 12:28:30 2008 -0400
+commit 6c27b911222cdee9a057de0be7e8b2eff8b1ff2a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed May 14 15:44:04 2008 -0400
 
-    Prefer glxvisuals with stencil buffer for default visuals
+    Restore compression of duplicate log file entries.
     
-    The first fbconfig which has a depthbuffer > 0  and doublebuf is choosen
-    when associating fbconfigs with the visuals, indepenent of stencil bits.
-    This happens to work ok on intel as there all fbconfigs with a
-    depthbuffer > 0 also have stencil bits.
+    This undoes the workaround for bug #964, which was an Xprintism.
+
+commit 937e5aae33d3b5112b5d10d605e25f57b48caa3f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 14 22:30:15 2008 +0930
+
+    dix: don't undisplay cursor if we don't own a sprite.
     
-    This patch fixes this by first trying to get a fbconfig for default X visuals
-    with both stencilbuf, depthbuf and doublebuffering, and if that fails fallback
-    to trying to get one with only a depthbuf and doublebuffering.
-    (cherry picked from commit f6e22d69af6bc8f63c3a46535a09e217696a679f)
+    Sometimes we didn't have a cursor when coming back from suspend. Reason was
+    that the suspend caused the server to lose the device that was attached to the
+    VCP, and a RemoveDevice() would then set the cursor to NULL.
+    Solution: only set the cursor to NULL if we actually own the sprite.
+
+commit cbb4e80eb7cc8dc2aff5e5268b49cdb7b3c3d5fa
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed May 14 01:13:15 2008 -0700
+
+    XQuartz: More work on the Mach-IPC startup path
+    (cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
+
+commit 3b57c59bb08c9a3211f4ae57d9e2fb569d61bf2f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 13 10:40:20 2008 -0700
+
+    Xquartz: More work on the new Mach startup
+    (cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
+
+commit e435acc84cb9477455ad005cee658630cbd363a2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 12 17:57:07 2008 -0700
+
+    Added missing to EXTRA_DIST
+    (cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
+
+commit f7d6d20ad64b235700185784d317417a94d1814b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 12 13:36:35 2008 -0700
+
+    XQuartz: Cleaned up the about box.
+    (cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
+
+commit b37e1f1f5ccc5a48df665449b0e31c4d25cc323c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 12 11:34:06 2008 -0700
+
+    Don't need the fink-friendly printf in the DDX anymore.
+    (cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
+
+commit 68b4f250eef441a3d75e3b9b2665a51d3a1538d6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 14 16:18:48 2008 +0930
+
+    dmx: fix build.
+    
+    Just because it builds, doesn't mean it works.
+
+commit 00db0f35acc00cb771ab1c23f35b0db1c25d81bb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 14 15:29:28 2008 +0930
+
+    dix: InitAndStartDevices doesn't need a window parameter.
+    
+    Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
+
+commit da728f2127aaa5c1ed5d22bb9f3d0c8ff19e4933
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 14 15:17:05 2008 +0930
 
-commit ce1f6de2e8d5473a8d6995638a7289fdc8f6dc4b
+    dix: don't use serverClient in AddInputDevice, use the one supplied instead.
+    
+    We pass in the client that wants to create the device anyway, lets use the
+    parameter instead of hardcoding the serverClient.
+    
+    Wow. I hope this is merge detritus, otherwise it'd be a sign that I didn't
+    have enough coffee that day.
+
+commit a6659291c798f417a76d9aa7944694ff27c01fa7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 14 09:42:50 2008 +0930
+
+    mi: protect against NULL-pointer dereference.
+    
+    Required by the recent patch to use a NullCursor instead of UndisplayCursor().
+
+commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue May 13 16:39:30 2008 -0700
 
     When XKB fails to open rules file, log the file name, not the NULL file pointer
-    (cherry picked from 7cdc19b29d93bf15cecfd6b69e269fab2501bca0 commit)
 
-commit 8afd1d62f6298d43367ce52f3b5612a197e99ca0
+commit dc3aba8a559d4304844ee1cc306c577a63b82762
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 13 14:37:26 2008 +0930
+
+    Xext: emulate XI events from core events when faking input.
+    
+    We need XI events for event processing, so lets get rid of the pure core
+    events ASAP.
+
+commit 8b3802d32041547fd6ed5393a56281c5c83d260e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 13 13:47:52 2008 +0930
+
+    Xext: core button events have rootX/Y unset too.
+
+commit ed65e8b4f02a6da7f1c5d85984a9ccf6a94d0181
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon May 12 18:49:34 2008 -0700
+
+    Check for strcasestr and workaround it on systems without it
+
+commit 8234af6c6a3ade13f7720743bde79957c7df3f6c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 13 11:17:39 2008 +0930
+
+    xfree86: remove Ubuntu-ism.
+    
+    Additional #include was required due to broken libc headers or something like
+    that. Remove it, there's more to the world than ubuntu alone.
+
+commit 59b8d29b3a91c65787dfadb5610342a62e85c48c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 12 21:22:54 2008 +0930
+
+    Xi: Fix up ProcIVector, got out of sync with the protocol.
+    
+    When the opcode squash happened in the protocol, the processing vector got out
+    of sync for a few requests. As a result, client and server would interpret
+    requests differently, leading to a couple of BadLength problems.
+
+commit 1fc1a2897e9185838c29d9ffff07c39d2fdf174f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 12 20:14:05 2008 +0930
+
+    Remove UndisplayCursor API.
+    
+    We can achieve the same thing by simply displaying a NullCursor, there's no
+    need for a separate API.
+
+commit 913989d643595030e67e7c0a758a16ae0da62ed9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 12 20:05:43 2008 +0930
+
+    mi: don't try to display a cursor for devices w/o cursors.
+
+commit 248a1df63430717550adb0e79068d8f9fcfacb0b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 12 20:05:21 2008 +0930
+
+    render: don't dereference cursor if cursor is NULL.
+
+commit c50b5d978981b13cdb22a9ad41c1b64f90cebe51
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Sun May 4 13:45:27 2008 -0700
 
@@ -2132,9 +12680,78 @@ Date:   Sun May 4 13:45:27 2008 -0700
     Don't skip the first visual on the other screen in PanoramiXMaybeAddVisual.
     
     Skip the loop in PanoramiXTranslateVisualID if screen is 0.
-    (cherry picked from commit c50b5d978981b13cdb22a9ad41c1b64f90cebe51)
 
-commit f2278a882f26a3176110241b65b3bead9b08110f
+commit 86678e7cc2b021851ff508433fa160170f500c51
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon May 12 14:53:37 2008 -0400
+
+    Fix fbdevhw initialization for PCI drivers.
+    
+    graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
+
+commit 1c8bd318fbaf65890ef16fe26c76dd5e6f14dfde
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon May 12 14:15:11 2008 -0400
+
+    X n'est pas une print API.
+
+commit f9fae16456c30479b0cb9317e57200af36795785
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 12 10:36:44 2008 -0700
+
+    XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app
+    (cherry picked from commit 78032815aeb10c22ff45b49702e9c9df82ab471c)
+
+commit ac4e33a9cd0ca2f0ec76181d11d5b90b82690c05
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 12 09:27:27 2008 -0700
+
+    XQuartz: More startup work... listen if we're the actual server
+    (cherry picked from commit 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
+
+commit a7800d9355377ac02833613c2ffc2423beec9970
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 9 16:44:31 2008 -0700
+
+    XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
+    (cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
+
+commit 04211c3532ca078420e3745a5eac3d9de120bc32
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon May 12 03:03:13 2008 -0400
+
+    Prevent the -wm command line option from causing a SEGV
+    
+    The -wm (when mapped) option for the BackingStore support has been
+    causing the server to dereference a NULL pointer.
+    
+    This has probably been the case since backing store has been
+    implemented on top of Composite.
+    
+    It looks like (some of?) Composite didn’t expect its WIndowPtr
+    argument to be the root window.
+    
+    In Composite’s compCheckRedirect() function we now avoid calling
+    compAllocPixmap() and compFreePixmap() when the pWin pointer’s
+    parent member is NULL, as is it the case with a server’s root window.
+    
+    This addresses:
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=15878
+
+commit 7e768c08f7809b8dba4db1931e63314e2b6e1cfa
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon May 12 02:53:59 2008 -0400
+
+    Clean up whitespace
+
+commit 3b6735528efc6d69ab7a7cd63dd09c87db7ef115
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon May 12 16:36:42 2008 +1000
+
+    pci: don't do this pci stuff when we don't have hw access
+
+commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Sun May 11 23:17:27 2008 +0200
 
@@ -2143,17 +12760,226 @@ Date:   Sun May 11 23:17:27 2008 +0200
     KdInitOutput() used to enable Composite when it was disabled by default,
     but now this hack prevents ``-extension Composite'' from working.
     Remove it, as Composite is enabled by default anyway.
-    (cherry picked from commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082)
 
-commit 64948dc667fb6841147e87dafd5711b544511cf1
+commit 1a01e96c6d15ef17a8b5ab1afa361fb12476a25e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 9 15:38:44 2008 -0700
+
+    Return a valid X error when stuck in font alias loop
+    
+    Part of fix for Sun bug 4258475
+    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
+
+commit 7b3066d9b9099135d9c49e0682161d5568fc535b
+Merge: 2a3d142 315f089
+Author: Drew Parsons <drew@emerall.com>
+Date:   Sat May 10 00:01:15 2008 +1000
+
+    Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
+
+commit 2a3d1421e0cc18822ae8f478fcc272e16a9e9340
+Author: Drew Parsons <dparsons@debian.org>
+Date:   Fri May 9 23:20:11 2008 +1000
+
+    Disable D-BUS from Xprint.
+    
+    Use dummy config functions to replace those from config/config.c, and
+    therefore do not link Xprt with $CONFIG_LIB.
+    
+    Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
+    (WaitForSomething() not waiting) when built with dbus, which was
+    causing Xprt to use 95% cpu.
+
+commit 315f089056da67d4c463ed002eb2b74e38493b49
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 8 19:46:03 2008 -0700
+
+    XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
+    (cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
+
+commit 28ac79450c69219dc501e072c6e5028e7136380d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 8 19:47:40 2008 -0700
+
+    Updated .gitignore for new Xquartz layout
+    (cherry picked from commit cd4d2355e227549a3410485a130549dd91ccdcfe)
+
+commit a07c5ad172b343ef26d2b41ff25f143950441c23
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 8 16:57:42 2008 -0700
+
+    XQuartz: Set bundle version to 2.3.0
+    (cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
+
+commit 05f23ed3ea6ee0f052aee41b6573325fe0063fd8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 6 16:12:41 2008 -0700
+
+    XQuartz: Fixed some issue in our bundle creation
+    (cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
+
+commit 90b963c0da2b33bdc21483f1a089b95c7e717333
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 6 16:07:33 2008 -0700
+
+    Set CSRG_BASED on OSX
+    (cherry picked from commit ff085deba18682caa2f93d61a75b38db87d747b1)
+
+commit ff013b0da4e6d33b2b69ce1212e9bd62050574e1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 8 16:58:31 2008 +0930
+
+    config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
+    
+    The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
+    specifies a X-specific {rmlv}, then this is overridden through the use of
+    input.x11_options.Xkb{RMLV}.
+    However, the way how the server parses options--by ignoring capitalisation,
+    underscores and spaces--the HAL and the x11_options would override each other.
+    
+    So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
+    only actually add them to the device after parsing _all_ options.
+    
+    * rmlv ... rules, model, layout, variant
+    
+    See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
+    (cherry picked from commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17)
+
+commit 901978ebe0f446532255701cd536e246e805a55b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 8 14:05:56 2008 +0930
+
+    config: remove trailing whitespaces.
+    
+    It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
+    (cherry picked from commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8)
+
+commit 1c54c148895225e4ab3c781fe57d09e5f64353aa
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri May 9 00:26:16 2008 +0300
+
+    Revert "GL: Make errors non-fatal"
+    
+    Turns out this just caused segfaults further down the line.  Oops.
+    
+    This reverts commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8.
+
+commit f17ba5d5849c92603f453195aca384844ca76d74
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Thu May 8 16:04:24 2008 -0400
 
     Bug #13104: Remove broken XAA a1 glyph fast path.
+
+commit ddaecfa13cefee7c66b39b606c8640c6544d4943
+Merge: 9c2e087 cf20df3
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu May 8 14:33:58 2008 -0400
+
+    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
+
+commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 8 16:58:31 2008 +0930
+
+    config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
+    
+    The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
+    specifies a X-specific {rmlv}, then this is overridden through the use of
+    input.x11_options.Xkb{RMLV}.
+    However, the way how the server parses options--by ignoring capitalisation,
+    underscores and spaces--the HAL and the x11_options would override each other.
+    
+    So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
+    only actually add them to the device after parsing _all_ options.
+    
+    * rmlv ... rules, model, layout, variant
+    
+    See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
+
+commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 8 14:05:56 2008 +0930
+
+    config: remove trailing whitespaces.
+    
+    It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
+
+commit 1a314a1ef06222977e7ccb94331ce31c17534b2a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 8 13:16:48 2008 +0930
+
+    Revert "config: deprecate (and ignore) the use of input.xkb.whatever options."
+    
+    daniels:
+    "Hrm, I'd prefer to have input.xkb.{m,l,v,o} be the primary keys, and
+    have input.x11_options be a backup for that, rather than the former
+    being deprecated, for the reasons I listed earlier ..."
+    
+    see http://bugs.freedesktop.org/show_bug.cgi?id=13037#c51
+    
+    This reverts commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22.
+
+commit cf20df39cc78203d17b99223908af388ecbf7d0e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed May 7 22:24:19 2008 +0300
+
+    XKB: Actually explain keymap failures
+    
+    When something went wrong building a keymap, try to explain to the user
+    what it actually was, instead of the dreaded 'Failed to load XKB keymap'
+    catch-all.
+
+commit 641a5f955b7b3ae04eeb6bc45fb30b0b531898e4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed May 7 22:29:04 2008 +0300
+
+    Build: Ensure xf86DefModeSet.c ends in an empty line
+    
+    This shuts up a warning.
+
+commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed May 7 22:28:45 2008 +0300
+
+    GL: Make errors non-fatal
+    
+    GLX, there's more to the world than just you.  If you fail to load the
+    software renderer, don't bring the entire server down.
+    
+    The error path probably needs better testing on this one, but it seems
+    mostly okay to me.
+
+commit 9c2e0871cfbe54e73eec1f790a7e383d08555055
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed May 7 13:21:26 2008 -0400
+
+    Bug #13104: XAA: Adapt to glyph storage changes.
+    
+    Glyph bits are now stored in a proper pixmap, not just hanging off the
+    end of a GlyphRec.
+
+commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 7 13:13:57 2008 +0930
+
+    config: deprecate (and ignore) the use of input.xkb.whatever options.
+    
+    These options are still sent by some HAL implementations (e.g. HAL on FC8),
+    and may overwrite the options set in the x11-input.fdi file.
+    For a more detailed description of why see Bug #13037, comment 42.
+    
+    X.Org Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037#c42>
+
+commit b6a0c6d4864f73a18beb841b16e9be56f2fcd77e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue May 6 17:06:34 2008 -0700
+
+    Allow using libmd instead of libcrypto for SHA1 hashing in render/glyph.c
     
-    (cherry picked from commit f17ba5d5849c92603f453195aca384844ca76d74)
+    Builders can force one or the other by passing SHA1_LIB & SHA1_CFLAGS
+    to configure
 
-commit f2aa0000a2220df4158ded8284d70954670aff36
+commit 718652eaf9221e0eeec2c971dd7baa97f827451b
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue May 6 17:52:37 2008 -0400
 
@@ -2166,20 +12992,104 @@ Date:   Tue May 6 17:52:37 2008 -0400
     
     Since XAA isn't ever growing the ability to do sane glyph accel, just force
     glyph pixmaps into host memory by catching them at CreatePixmap time.
-    (cherry picked from commit 718652eaf9221e0eeec2c971dd7baa97f827451b)
 
-commit f7a9d30f825d5483cb89144a0dc2bfd0d1f47796
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Wed May 7 22:24:19 2008 +0300
+commit a85d3ac87cc354093bb1e88697c44254e7721bb9
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 6 02:59:13 2008 -0700
 
-    XKB: Actually explain keymap failures
+    XQuartz: Fixed typo
+    (cherry picked from commit 56b7988d2662caa4d31094695b414080e4470ed4)
+
+commit 077ced6384abad78253e857091e78f3685965b9d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 6 02:47:03 2008 -0700
+
+    XQuartz: Added uncommitted files
+    (cherry picked from commit e414ec462cfc63f8eb7f504f526f5a2c73f51e69)
+
+commit 80e502c5d1f7e9221c6ae40716d6402fd28d8806
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 6 02:28:36 2008 -0700
+
+    Fixed up dist
+    (cherry picked from commit f225222ba2bf4f03425107f258d60b73c88efaec)
+
+commit 7295e544332b0fa929f651304f9d4aca3db4a33e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue May 6 00:06:19 2008 -0700
+
+    XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
+    (cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
+
+commit d41d677ab4118e73140ea2392e0d48eb361af1cf
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Mon May 5 20:55:08 2008 -0700
+
+    Xquartz: experimental embedding of Sparkle.framework
+    (cherry picked from commit b7a1a640cef8c69442859cbf89034ad362a19684)
+
+commit 9e0d73fd8a43647b648ec5b2f0bcaae30c03259c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 6 17:52:15 2008 +0930
+
+    xfree86: call SetCursor for the VCP when switching between SW/HW rendering.
     
-    When something went wrong building a keymap, try to explain to the user
-    what it actually was, instead of the dreaded 'Failed to load XKB keymap'
-    catch-all.
-    (cherry picked from commit cf20df39cc78203d17b99223908af388ecbf7d0e)
+    We need a manual call to SetCursor when we switch from SW to HW rendering and
+    the other way round. This way we display the new cursor after removing the old
+    one.
+    In addition, we only update the internal state for the VCP's sprite. This way,
+    when we switch back to HW rendering the state is up-to-date and wasn't
+    overwritten with the other sprite's state.
+    
+    The second part is a hack. It would be better to keep a state for each sprite,
+    but then again we don't have hardware that can render multiple cursors so we
+    might as well do with the hack.
 
-commit 3e7152704895223fae9407a3e109af82b2908c9b
+commit e4ebfed1785597b48b68e1bbdde3e5c4061b749f
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Tue May 6 16:46:37 2008 +1000
+
+    xf86edid: fix typo in debug output
+
+commit b9c1a57e7a98dea63cd362f714411547e728a85a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 6 14:51:23 2008 +0930
+
+    xfree86: switch between to SW cursors if more than 1 sprite is available.
+    
+    Switches back to HW cursors when sprites other than the VCP are removed.
+    The current state requires the cursor to change shape once before it updates
+    to SW / HW rendering (whatever is appropriate), e.g. by moving into a
+    different window. Until this is done, the cursor is invisible.
+
+commit 3df88c17e315b5ae580096e4bc88920d1f452e83
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 6 11:50:20 2008 +0930
+
+    xfree86: re-enable hardware cursor (for a single cursor)
+    
+    This commit enables HW rendering for cursors again, but only for a single
+    cursor. Other cursors can be created, however they will not be visible.
+
+commit 6acc2acd0db2826add7c47e94e4061d169a41f88
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon May 5 15:32:26 2008 -0700
+
+    Rootless: mi doesn't let us resize root, so we need to do it ourselves...
+    (cherry picked from commit c1ec36e28cff857664090cc8792db1ae93b783fa)
+
+commit efa65a0317e12c9ad34fa00fe90bf5eae9fa2670
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun May 4 21:52:58 2008 -0700
+
+    Rework composite overlay window code to fix several resource management bugs.
+    
+    The composite overlay window code had several misunderstandings of the
+    workings of the X server, in particular error handling paths would often
+    double-free objects. Clean all of this up by using resource destruction as
+    the sole mechanism for freeing resource-based objects.
+
+commit 6c1accce87c9bd640c1b4bbc49bae7d44b1cc97b
 Author: Keith Packard <keithp@keithp.com>
 Date:   Sun May 4 21:51:08 2008 -0700
 
@@ -2191,34 +13101,996 @@ Date:   Sun May 4 21:51:08 2008 -0700
     added to the totalClip region for use by other windows. That's wrong.
     Instead, simply empty the borderClip for TreatAsTransparent windows right up
     front.
-    (cherry picked from commit 6c1accce87c9bd640c1b4bbc49bae7d44b1cc97b)
 
-commit fd0ec73bcb780dbc04478b17ad6c02aa55ca2558
-Author: Jordan Crouse <jordan.crouse@amd.com>
-Date:   Mon Apr 21 12:09:00 2008 -0600
+commit d500eeb9458336780d77baf8b7db96e1f7ff4f0d
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Sun May 4 10:26:25 2008 -0700
 
-    xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
-    (cherry picked from commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd)
+    Xephyr: Handle depth 30 and reject higher depths rather than crashing.
+
+commit f4a68f3701889950d3b98842d021f357f3913fea
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 2 17:35:57 2008 -0700
+
+    XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
+    (cherry picked from commit 8d9eab3a2ec5955cc2698fdcb1fa6ed12b2aadb7)
+
+commit 96fa7da3b87e2f9187ec13dad259beefdc17cd94
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri May 2 16:53:45 2008 -0700
+
+    XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
+    (cherry picked from commit ff10c37bdd09656cf2f7ee9577f5552caa1ffdb8)
+
+commit 6f63724b28c8b3fd85314fb95d1e4f363b610e19
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 2 14:56:58 2008 +0930
+
+    xfree86: don't try to repaint the cursor before cursors exist.
+
+commit 334456952930cb3e55c02fcdada2d0c074cd0520
+Merge: 8e56fd9 3b8d534
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 2 11:00:14 2008 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xi/exevents.c
+    	dix/devices.c
+
+commit a338007be6fd4302af012109d959f43ac7eab2b1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu May 1 18:02:59 2008 -0700
+
+    XQuartz: Adjust the screen origin offset properly for multimonitor setups
+    (cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
+
+commit 8e56fd9728d63a7a48ef44503425c6e25c7c9ffb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri May 2 10:22:06 2008 +0930
+
+    dix: continue to check for invalid valuator ranges.
+    
+    In an ideal world, the drivers would init all axes with NO_AXIS_LIMIT. In the
+    real world, this is an ABI break, so let's just leave the old check in.
+
+commit 3b8d53452cd6c74d32d7759964a7cd9ee775f161
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Thu May 1 15:10:52 2008 +0200
+
+    EXA: Fall back in CompositeRects if the driver can't accelerate Composite.
+    
+    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=15780 .
+
+commit 01c61f3d972fc2f4e5bb536dd00d8b6bbeb0fb3d
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu May 1 01:02:39 2008 -0300
+
+    xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.
+    
+    This patch only creates a Files section if required, so if no entries are
+    added, an empty Files section will not be created.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 6899ff81e8f668382e3e2f9afdd9cdf51d0e0f7d
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Wed Apr 30 16:38:42 2008 -0300
+
+    Fix an off by one read error in drmSIGIOHandler().
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit ec0419b50534006a272278b79ee51538193661cb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 30 17:30:57 2008 -0700
+
+    XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
+    (cherry picked from commit 1fcf74a436f2e19cceb3f285b89859025d94c040)
+
+commit 28d1e21f1523d475cb757d3cfa33737ed62c534d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 30 17:30:32 2008 -0700
+
+    Dix: Cleaned up sanity checking in Get{Pointer,Keyboard}Events
+    
+    XQuartz was crashing because the Appkit thread was trying to GetXXXEvents while the Xserver thread was exiting.
+    This adds some more sanity checks and avoids that crash
+    (cherry picked from commit 34ec4bd6acb834c0e3f9a5042a0cc3f52c6f3a68)
+
+commit ce36ae526d88d20ff67cd6cb429fb06f48d231f6
+Author: Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
+Date:   Wed Apr 30 11:58:32 2008 +0300
+
+    Add M32R architecture support (bug #10020)
+    
+    Still needs autotools support, so this won't actually _build_: it's just
+    a starting point.
+
+commit a0e6a7d4f507c5c0a0b11adb10394af58a0a6e07
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 30 17:57:48 2008 +0930
+
+    dix: resize EQ to minimum size to avoid reallocs during SIGIO.
+    
+    When a new device is added, calculate the event size needed if a DCCE event is
+    sent and set the EQ's event size to this minimum. This avoids reallocs when a
+    event is sent (which may happen during a SIGIO).
+
+commit b71b51c982706501b6229532ce342752207426bb
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Tue Apr 29 23:37:58 2008 -0700
+
+    xquartz: created darwinTablet, to represent tablet events
+    (cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
+
+commit 519581b0bab5cc6dac397877da485745f18c2120
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Tue Apr 29 23:00:09 2008 -0700
+
+    xquartz: remove unused params from DarwinEQInit
+    (cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
+
+commit d70487a4c09cfeb90d996ab40a23a74b2c15be6f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Apr 29 23:59:26 2008 -0700
+
+    XQuartz: Fix to tablet-event handling code; we now scale
+    more conservatively (to match Linux's Wacom driver) and
+    we now receive all tablet-related events.
+    (cherry picked from commit 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
+
+commit fea39c94bcc8b635d37530d8a27ee92acab484fe
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 30 13:17:14 2008 +0930
+
+    dix: fix typo from last commit.
+
+commit ffaccc2dc91f4ca4ea10da010206a0a7d2b5540c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 30 11:45:19 2008 +0930
+
+    input: replace -1 as default axis limit with NO_AXIS_LIMIT define.
+    
+    This allows easier refacturing of the coordinate limit handling. Grepping for
+    -1 is boring.
+
+commit 00acb40f2bc5bb4a1977b9b08db75630677ff787
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 30 11:29:03 2008 +0930
+
+    dix: fix typo in clipAxis.
+    
+    Check needs to be (min_axis < max_axis), not (min_axis < min_axis)
+
+commit f65a1a62f9eac2f6620d5d469dbf6c79b2eadab7
+Author: Hong Liu <hong.liu@intel.com>
+Date:   Tue Apr 29 09:00:11 2008 -0700
+
+    Keep rotation wrappers in place while transforms are in use
+    
+    LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
+    this, the presense/absence of that data is insufficient to know whether
+    the screen function wrappers are necessary. Instead, the 'transform_in_use'
+    flag should be used.
+    
+    This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
+    time to free the rotation data; it will be reallocated on EnterVT.
+
+commit 18b33dd4ff46f63bad70b493b1d0b0758c961ada
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 29 15:24:55 2008 +0930
+
+    Xi: stop excessive use of _X_EXPORT.
+
+commit 2b179c32ac40f5258d95ae16da96a79fa8eea696
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 29 15:15:16 2008 +0930
+
+    include: add declaration for CopyGetMasterEvent to shut up compiler warning.
+
+commit ff36753755360aaa16ab8604a0ab78123884b57d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 29 14:53:41 2008 +0930
+
+    mi: call the custom event handlers for both MD and SD.
+
+commit ec2fca7e6f7ce8fdf33d959b7adeaae935ec4b37
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 29 14:40:44 2008 +0930
+
+    xfree86: DGA needs to call into Xi.
+    
+    Two steps: first use UpdateDeviceState() instead of replicating the device
+    changing code. And emulate XI events instead of core events.
+
+commit 8208b842b7dd3b30bafdd74147bdfa63bc00cc40
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 29 14:19:42 2008 +0930
+
+    Xi: add IEventBase global variable. Stores event base for X Input events.
+
+commit 46340b740640b76b52b8e69bc67f9201c7e974c3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 29 14:17:48 2008 +0930
+
+    Xi: change UpdateDeviceState to be _X_EXPORT.
+
+commit 3a922c5d07509703a3eeda2bbec6f332e6b0ffac
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 28 17:32:54 2008 +0930
+
+    Xi: apply ValuatorEvent data to the device's valuators.
+    
+    After UpdateDeviceState, the device has the current position in absolute
+    coordinates, the event has the correct valuator data to be delivered to the
+    client.
+
+commit f2a20294fe26f4c9d245d24d065331fefd8f830d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 28 16:56:22 2008 +0930
+
+    dix: store all valuators as they come from the device in the valuator events.
+    
+    The event's sequenceNumber is mis-used to determine whether the values are
+    relative or absolute.
+
+commit d5ab89f4f1acbe2614036e8934122185ac0f81ee
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 28 15:52:24 2008 -0700
+
+    XQuartz: Unset CFProcessPath... blech
+    (cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
+
+commit 0c2312b21b6700c1425baccaf9c26150b4f0fd6a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 28 15:28:21 2008 -0700
+
+    XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
+    (cherry picked from commit 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
+
+commit c3dc4bdbb018c0606d561e2dfb9a36e9297fa312
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 28 15:42:02 2008 -0700
+
+    XQuartz: Disabled DPMS extension
+    (cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
+
+commit 07382a70c7ac9807dfb31821a4763bea2309bde6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 28 12:36:54 2008 -0700
+
+    XQuartz: Added thread debugging to xprFrame.c
+    (cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
+
+commit 8349732a6720652bfbad7874a952be73a0e8e77b
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Apr 28 21:09:35 2008 +0200
+
+    EXA: Try to accelerate non-antialiased text via the glyph cache as well.
+    
+    Treat 1 bit glyphs and masks as PICT_a8 in the glyph cache. We're not able to
+    accelerate them otherwise.
+
+commit a65d530040bb561ba88c5d8c71633a7c0bf11e89
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Apr 28 21:03:12 2008 +0200
+
+    EXA: Accumulate glyphs whenever possible, for full benefits of the glyph cache.
+
+commit e7eaac59c424a205dd106fc7d70734ff4b390f28
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Apr 28 21:00:55 2008 +0200
+
+    EXA: Glyph cache upload tweaks.
+    
+    Track damage after using UploadToScreen directly.
+    
+    Don't waste any effort on empty glyphs.
+
+commit cc08c06665ffe29ad44d023d75d0f86e5338875d
+Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
+Date:   Mon Apr 28 21:00:55 2008 +0200
+
+    EXA: Use UploadToScreen() for uploads to glyph cache
+    
+    When possible, use UploadToScreen() rather than CompositePicture()
+    to upload glyphs onto the glyph cache pixmap. This avoids allocating
+    offscreen memory for each glyph making management of offscreen
+    areas much more efficient.
+
+commit 13fd2256300b61d88b840952d838f834523f5dd7
+Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
+Date:   Mon Apr 28 21:00:55 2008 +0200
+
+    EXA: Clean up debug messages
+
+commit fcb5949928f1c27f67f40c094c3c673786574422
+Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
+Date:   Mon Apr 28 21:00:54 2008 +0200
+
+    EXA: Fix overlapping glyphs in glyph cache
+    
+    Allocate each cache at a different vertical position in the
+    per-format pixmap. Fix width/height confusion when choosing
+    the cache for a glyph.
+
+commit 40eb14c9482457969e0bde97c49edad536285e02
+Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
+Date:   Mon Apr 28 21:00:54 2008 +0200
+
+    EXA: Add exaCompositeRects()
+    
+    Add a function to composite multiple independent rectangles
+    from the same source to the same destination in a single
+    operation: this is useful for building a glyph mask.
+
+commit 54184110f6f3e5d7276d5431e739a4fcf0c3523e
+Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
+Date:   Mon Apr 28 21:00:54 2008 +0200
+
+    EXA: Use a single large glyph cache pixmap
+    
+    Add back exaGlyphs(); the new version copies the glyph images
+    onto a single large glyph pixmap and draws from their to the
+    destination surface. This reduces the management of small
+    offscreen areas and will allow us to avoid texture unit setup
+    between each glyph.
+
+commit e9734306088e12f2cd68bf347ecf8415be4f0268
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 28 11:47:49 2008 -0700
+
+    XQuartz: More startup / threading house cleaning.
+    (cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
+
+commit 4b46fc931e61bec0abd6a86062e46dd7a408e745
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 28 10:50:51 2008 -0700
+
+    XQuartz: Updated Localizable.strings
+    (cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
+
+commit 4017ebe5bfa7a261cd1135801756c44e9fe93ca1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Apr 27 00:01:14 2008 -0700
+
+    XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
+    (cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
+
+commit 53dba5381fdd8f644e16aaa0ecb05df4dc615b23
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 28 11:37:52 2008 +0930
+
+    dix: if alloc of a master keyboard fails, remove the master pointer.
+
+commit 1fab51edfc82e1ef60dfa29fd5d93478066a3998
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 28 11:37:21 2008 +0930
+
+    mi: guard against NULL-pointer dereference.
+
+commit b5004722a208479a4bc762ff428bf4cbeb430d53
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 28 10:26:01 2008 +0930
+
+    Xi: Only return VCP, VCK and floating SDs to Xi 1.x clients.
+    
+    This is better than the approach implemented with
+    8973a3f7983240407dd6da59b3643f40e6a3d83a which disabled XI altogether for 1.x.
+    Instead, return a device list that resembles a traditional XI setup on pre XI
+    2.0 servers. If the client tries to open a device other than a floating SD,
+    return a BadDevice error.
+
+commit 0bd28315afc3b7223f8ff9f17597db09500a9388
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Apr 26 23:00:42 2008 -0700
+
+    Xquartz: Added missing to EXTRA_DIST
+    (cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
+
+commit ef1c52053755fa14b4ca98b22c506f73f5f4a4b7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Apr 26 19:21:05 2008 -0700
+
+    XQuartz: Cleaned up startup and thread creation a tad.
+    (cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
+
+commit b114d4e861885cc5b49cd81b33ad825461811b3e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Apr 26 17:04:49 2008 -0700
+
+    XQuartz: Don't subtract the titlebar off of the pointer_y
+    (cherry picked from commit 00a9567acce2b27a649cbebd4790e3043688a7d8)
+
+commit 684b5d8382bf0bc6cd55774226ee362e81c0adbf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Apr 26 19:55:59 2008 +0930
+
+    Xi: whoops, stray ! caused a bit of memory mess.
+
+commit 87071b604c4b7c3c79ab784e2c09ff691e2bc5ad
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Apr 26 19:37:57 2008 +0930
+
+    Revert "Xi: disable XI for clients < XI 2.0"
+    
+    Turns out some programs don't like this change. gnome-settings-daemon crashes
+    hard if you tell it that XI doesn't exist. So, tell them we have XI, but leave
+    the other change (the one that pretends no devices are available).
+    
+    This reverts commit 8973a3f7983240407dd6da59b3643f40e6a3d83a.
+
+commit 7447a30fb27ed50a20a85b5a2de9afe7dea8cfa5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Apr 26 19:03:13 2008 +0930
+
+    Xi: if a pre-XI2 client tries to list the devices, pretend we don't have any.
+    
+    XI 1.x isn't supported anymore, so let's pretend we don't have any devices.
+    This stops clients from opening them and thus stops interference.
+
+commit 8973a3f7983240407dd6da59b3643f40e6a3d83a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Apr 26 17:48:52 2008 +0930
+
+    Xi: disable XI for clients < XI 2.0
+    
+    Sorry. With the huge changes in the device handling I honestly don't know how
+    to support XI and XI2 alongside. So let's just pretend XI doesn't exist if a
+    client doesn't request it supporting XI2.
+
+commit b304b0a65cc57127cdea103f2c5114e4ea79af41
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Apr 26 17:38:55 2008 +0930
+
+    Xi: add versioning support.
+    
+    Remember the version the client sent to us, so we can adjust our replies
+    accordingly. This requires the client to use the {major|minor}Version fields
+    in the GetExtensionVersion request. However, they were padding before, so we
+    must assume they are garbage if nbytes is non-zero. If nbytes is zero, the
+    client is probably a new client and we can handle it correctly.
+
+commit b9ca7896356f79ee27be5d5aa62052f6984282b0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 25 17:54:36 2008 -0700
+
+    XQuartz: Added some pseudoramiX debug traces
+    (cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
+
+commit e251c9e75afdc5e32f2bc9801712272358934266
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 16:49:35 2008 +0930
 
-commit 7c05b4c6214a9bbc8968c49a40363f8461f527d5
+    Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
+
+commit 1d0438de176551aaeff549664f00b8bd83d465af
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 16:28:58 2008 +0930
+
+    Xi: remove RemoveOtherCoreGrabs()
+    
+    PickPointer() returns grabbed devices, so we can't get a double grab anyway.
+
+commit be5ff2b8d8a392eb8611e1fcd6da4752d68a7f9d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 16:25:13 2008 +0930
+
+    Xi: remove some superflous code
+
+commit 0209e46249b61974a6e3ed54a51cc36dfaf0064f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 24 23:48:11 2008 -0700
+
+    XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
+    (cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
+
+commit b65dbd350b8518bb90bed9cdc64dd900bc75d20c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 24 21:14:04 2008 -0700
+
+    XQuartz: Cleaned up multi-monitor support.
+    (cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
+    (cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
+
+commit b093bf3ec37367172be3b44a04f0f43890ba7d7d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 15:15:31 2008 +0930
+
+    dix: don't search for grabbed devices, PickPointer does it for us now.
+    
+    Follow-up to 93ee33830778b9ec85ad81496572677a30022b09.
+
+commit 6198bad07edc51ff4a264a9361c5e9b6c74647a6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 15:02:40 2008 +0930
+
+    dix: remove misleading (stale) comment
+
+commit 93ee33830778b9ec85ad81496572677a30022b09
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 15:02:13 2008 +0930
+
+    dix: let PickPointer() return devices that are core-grabbed by the client.
+    
+    If the client currently holds a core grab on any device, this device has
+    priority, even over the ClientPointer.
+
+commit f5ac98747de921d48f36d4f3f66dbe73e26a6760
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 14:50:24 2008 +0930
+
+    Standardise copyright headers for all new files created as part of MPX.
+
+commit 3fc67b4205851dcffcc431a07a885828549bd9cf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 11:37:32 2008 +0930
+
+    Xi: remove leftover chpkpair.h file.
+    
+    Used to contain declarations for ChangePointerKeyboardPairing request
+    handling.
+
+commit 89add4ee986e38b833bb58750b3e5a664efb6f4a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 11:19:12 2008 +0930
+
+    dix: remove obsolete InitWindowPrivates().
+
+commit dcdc66fcfc7957aa7875fbf74fa3a55989a9a187
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 11:14:32 2008 +0930
+
+    dix: add mi.h include to stop compiler warning
+
+commit 97552413d213337e4bff8c89b06d58a09d722b05
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 11:13:05 2008 +0930
+
+    dix: remove "unused variable" compiler warning.
+
+commit d9c38e84cc492b931a2238757d438f562946e5bc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 11:04:02 2008 +0930
+
+    dix: remove pairingClient definition.
+    
+    This variable was used originally to determine which client is allowed to
+    change the pointer-keyboard pairing. For now, we just let anyone change it and
+    see how that works out.
+
+commit c14b858aeced81ff43723644f2de0f5c43f55755
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 11:02:12 2008 +0930
+
+    Xi: fix two compiler warnings
+    
+    unused variable in exevents.c
+    implicit declaration in warpdevp.c
+
+commit 6015b7a81252cd1729e6f4045f9b0c885c95b183
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 10:41:30 2008 +0930
+
+    Xi: handle requests through a dispatch handler.
+    
+    Same principle as e.g. in the RandR extension, rather than having a load of
+        if (type == XI_whatever)
+    use an array of function pointers.
+
+commit cb8cb87bc6decf75832c3724687000ecb658226e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 25 10:09:50 2008 +0930
+
+    Xi: remove unused #define DISPATCH
+
+commit 5869e3f5551e7e2d18e06a2f220b77d8c4161db1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 24 19:39:27 2008 -0700
+
+    darwin gots /dev/urandom, too yo!
+    (cherry picked from commit bf0144f38034bc59f108bb2c5270ff37fbe70e10)
+
+commit b1ae7c79db78cc3b789701f81328669f9f8ed80f
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Apr 24 19:02:43 2008 -0700
 
     Bug 14247: If pkg-config can't find openssl.pc, just link with -lcrypto
     
     X.Org bugzilla #14247 <http://bugs.freedesktop.org/show_bug.cgi?id=14247>
-    (cherry picked from b1ae7c79db78cc3b789701f81328669f9f8ed80f commit)
 
-commit 947419bce25e6f003c74ba72a33ee6145396d1d8
+commit 1daae4574c19a122baf73b6f9457b0d383b1bc66
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 24 18:22:05 2008 -0700
+
+    Added missing HAVE_LAUNCHD to dix-config.h.in
+    (cherry picked from commit 1b4b73cefbc2f3e3f6d0cb84ea202f84fb60abb5)
+
+commit 63853e4ad211945ed25541223207a78f83766ced
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 24 18:21:42 2008 -0700
+
+    XQuartz: Compile in missing glx source that we still need
+    (cherry picked from commit c611335dee267e41dcd1733a6bb5206b102f804e)
+
+commit ae982a27e4059fecd4048d245e6aa02f8dcc97d0
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Thu Apr 24 16:37:29 2008 +1000
 
     glx: test for valid read and draw privates before using them
     
     this should fix a bug where f-spot exiting blows up the X server
-    (cherry picked from commit ae982a27e4059fecd4048d245e6aa02f8dcc97d0)
 
-commit d7db6dd1a15393e9a30acfe87f7651ca1c9a0d75
+commit f377141912594f87144d6d7f7fdd279a101d8e6c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 13:30:28 2008 +0930
+
+    Xi: don't attempt to send to a NULL window.
+    
+    Only applicable when the server comes down/restarts. In this case,
+    WindowTable[i] may be NULL. Let's not try to send an event then.
+
+commit aec485f2dcc87b340759d67b60e7dee7931aaec5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 13:29:46 2008 +0930
+
+    dix: NULL out WindowTable after freeing all the windows.
+    
+    CloseDownDevices() tries to send PresenceNotify events. If the windows are
+    already freed, then we are accessing dangling pointers.
+
+commit 9ab4e2fd8eaa87dbd16835affb1aa54dcb1a619e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 23 11:38:08 2008 +0930
+
+    xfree86: don't free the config-file related information in DIDR. #15645
+    
+    In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
+    xf86ConfigLayout.input) alone for devices that were specified in the
+    ServerLayout section of the config file. This way, in the next server
+    generation we are left with what was the original config and can thus re-init
+    the devices.
+    
+    This is an addon to 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae, an attempt to
+    fix Bug 14418.
+    
+    X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
+    X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
+
+commit 7dc40c8eca90ec1bfab84b6f54418b64c0e62d63
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 12:47:29 2008 +0930
+
+    xfree86: Don't free master devices.
+    
+    The previous check works in the master-branch, but doesn't work with MPX. We
+    actually copy the SD's information into the MDs public.devicePrivate, so we
+    need to explicitly check whether a device is a MD before freeing the module.
+
+commit cc13f87cd8ac54223fdb0b3d3c043dc9b9be5a42
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 11:43:47 2008 +0930
+
+    Xext: XGE: change function definition to have return value on separate line.
+    
+    This seems to be the common style in most parts of the server.
+
+commit d0890c40b9a9c7965c08608e6950c078a29aac16
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 11:32:36 2008 +0930
+
+    Xext: add a few lines of comments to XGE.
+
+commit 745b90cde1007383ec8c887f02439a34ab427f31
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 11:27:22 2008 +0930
+
+    Xext: re-do the XGE versioning handling.
+    
+    Basically the same approach RandR takes. Remember which one the client
+    requested, send back the one the server supports. Also divide XGE server
+    version (now defined in geext.c) and the client's version (still in the
+    protocol definition).
+
+commit 5f3e5b3462bb02e828c70d0e1890b5a83d399d42
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 24 11:03:23 2008 +0930
+
+    Xext: remove trailing whitespaces in geext.{c|h}
+
+commit d09c520b322ba5c5f4d6b630a7c0c62e56732f82
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 23 10:22:34 2008 -0700
+
+    Moved Apple GL bits into our DDX subtree
+    (cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
+
+commit b05b416c622063b84747702a54ffd9a802d6fc11
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 23 09:59:48 2008 -0700
+
+    XQuartz: No need to include indirect.c a second time
+    (cherry picked from commit 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
+
+commit 565492c70a280d7e749500c5c0073bdcaf175c86
+Author: Ben Byer <bbyer@apple.com>
+Date:   Wed Apr 23 06:00:57 2008 -0700
+
+    xquartz: build fixes for GLX/DRI2 fallout (note: not guaranteed)
+    (cherry picked from commit 85a5796b667461bf1fafc68c07b3a704cd8efd5b)
+
+commit 6f6505db51763d902142a8161e71cad44f52560c
+Author: Ben Byer <bbyer@apple.com>
+Date:   Wed Apr 23 03:43:51 2008 -0700
+
+    glx / xquartz:  we still need glxcontentmodes.[ch] kthx
+    (cherry picked from commit 27545fd37f8c703b72f7cfc329778abc1ceabfa0)
+
+commit 4e3a8af5751ff88c0cadd612821b0ef349d250c5
+Author: Ben Byer <bbyer@apple.com>
+Date:   Wed Apr 23 03:39:41 2008 -0700
+
+    xquartz: clean up linker line for main binary
+    (cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
+
+commit 3685b171da51f853bfdb312d36622dfa03ee75be
+Author: Ben Byer <bbyer@apple.com>
+Date:   Tue Apr 22 23:53:23 2008 -0700
+
+    xquartz: remove vestigial aglGlx.c
+    (cherry picked from commit 40bd041e4255f26fcbdf0831e68619ae0f46ab39)
+
+commit f6e22d69af6bc8f63c3a46535a09e217696a679f
+Author: Hans de Goede <j.w.r.degoede@hhs.nl>
+Date:   Wed Apr 23 12:28:30 2008 -0400
+
+    Prefer glxvisuals with stencil buffer for default visuals
+    
+    The first fbconfig which has a depthbuffer > 0  and doublebuf is choosen
+    when associating fbconfigs with the visuals, indepenent of stencil bits.
+    This happens to work ok on intel as there all fbconfigs with a
+    depthbuffer > 0 also have stencil bits.
+    
+    This patch fixes this by first trying to get a fbconfig for default X visuals
+    with both stencilbuf, depthbuf and doublebuffering, and if that fails fallback
+    to trying to get one with only a depthbuf and doublebuffering.
+
+commit 00effad583713e882c3f2518bcd3da51bf4db716
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Wed Apr 23 17:46:30 2008 +0300
+
+    xephyr: XEPHYR_DRI is identical to XF86DRI
+
+commit 6a9f7f28ec455d2879ca1a315ce77c48af49e7f4
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Wed Apr 23 17:46:15 2008 +0300
+
+    xephyr: sync with mesa
+
+commit 7ffc68c5cc7108c9e56af25f9f9b4398f5b027df
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Wed Apr 23 17:45:54 2008 +0300
+
+    xephyr: libGL is client lib
+
+commit a27c244d72603e27766ff3900ab28fe094f7397e
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Wed Apr 23 17:45:37 2008 +0300
+
+    xephyr: Makefile cleanup 2
+
+commit d4d19b2f22002b1579438cb9cf08dd580c7ec005
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Wed Apr 23 17:45:19 2008 +0300
+
+    xephyr: Makefile cleanup 1
+
+commit cdc4571b580a8f4fd279404215bff0fb9a5b4816
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Sun Apr 20 17:06:26 2008 +0300
+
+    drop TOGCUP remnants
+
+commit 6cd9287aed3c128d9c10b9b042ba7b864143d522
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Sun Apr 20 16:58:51 2008 +0300
+
+    drop EVI remnants
+
+commit a88c6b66465c039bf92a54a496516fee4d900784
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri Apr 18 17:47:16 2008 +0300
+
+    glcore: drop GLcore (files)
+
+commit dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri Apr 18 17:47:01 2008 +0300
+
+    glcore: drop GLcore (build system)
+
+commit 567d389d47dee233a973b101e04ce41c47a68f34
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri Apr 18 17:46:18 2008 +0300
+
+    glcore: build from mesa, dlopen from xorg
+    
+    * The GLcore interface is disposable
+    * GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
+      GLX_PROVIDER_INSTALL_DIR
+
+commit efb723e166e5fa89e90c7b400fb4c7979b1f50c0
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date:   Fri Apr 18 17:45:53 2008 +0300
+
+    glcore: prepare for dynamic loading
+    
+    glcore gets linked with -ldl, -lpthread for s3tc and glapi
+    xserver needs
+            DLOPEN_LIBS - to dlopen the glcore dso
+            LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
+    
+    the ld flag is added to kdrive only when GLX is enabled, the net overhead for
+    Xephyr is ~155KB, could be reduced with --dynamic-list.
+
+commit fbad87f2ae9f97fcb43546b0fa35f1100415dfec
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Apr 22 23:50:11 2008 +0200
+
+    autoconfig: don't call closedir() when opendir() failed
+    
+    If opendir() fails, return from matchDriverFromFiles() immediately.
+    Ubuntu bug 217647.
+
+commit 76381092e8f650ec7d1f058fa4c8a7348893f775
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 23 02:22:14 2008 -0700
+
+    XQuartz: Make sure QuartzAudioInit() gets run.
+    (cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0)
+    (cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
+
+commit 275cdc1c74b7e43ecd931d312469fecc8d998ed1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 23 16:16:15 2008 +0930
+
+    xfree86: pass correct value to mieqEnqueue (merge detritus I guess)
+
+commit c3659cb414ef05da8fa09009b2b82a3deeeb4f3a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 22 21:54:02 2008 +0930
+
+    dix: always send FocusIn events if mode is NotifyUngrab.
+    
+    In the case of a NotifyUngrab, the flag for the device may already be set but
+    we still need to send the FocusIn event.
+
+commit 00815b3e5223e822f306db45cd4884a22ac9f7ed
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Mon Apr 21 14:34:39 2008 +0200
+
+    Don't set DRI2=yes if we can't find dri2proto or libdrm
+
+commit e77f65768efbf05cdf363a2f41f036f74eaa45de
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 18:07:46 2008 +0100
+
+    Reuse the existing framebuffer mode in kdrive/fbdev
+    
+    When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
+    that unless told otherwise.
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit c4fd1121531b0cba1a3e90fa747871d784365c7e
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 18:05:53 2008 +0100
+
+    Add mediumraw support to the linux kdrive driver
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 455383db95618a05ebdbeae78423e08065f0e14e
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 18:04:31 2008 +0100
+
+    Enable the epson kdrive driver
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 82b37d35af13a9f402755e167493ab256b664b9c
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 16:38:14 2008 +0100
+
+    Add support for AVR32
+
+commit 20a90bef8b4993f06cf76ad05e3d4c974e1614f6
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 16:37:02 2008 +0100
+
+    Add a default touchscreen path
+    
+    When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
+    specified.
+
+commit b44e89f4683ffcfd75eaf39f1f37d7461db44689
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 16:28:39 2008 +0100
+
+    Update to tslib 1.0
+    
+    Update the pkgconfig checks to tslib 1.0, and fix the LIBS definitions.
+
+commit 3848422d2354b7a5302fda92b05b0d728190e050
+Author: Ross Burton <ross@burtonini.com>
+Date:   Tue Apr 22 16:25:23 2008 +0100
+
+    Fix build when XKB is disabled.
+
+commit 744d0cfda74f8283801cc2d6c5eda48402455bc3
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Apr 21 22:06:38 2008 -0700
+
+    add missing DARWIN_GLX_LIBS in configure.ac
+    (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
+
+commit 8190ef87547b704848231bde10b1cdffc6442790
+Merge: 179a082 2ddbfd3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 22 18:04:05 2008 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xext/EVI.c
+    	Xext/appgroup.c
+    	Xext/cup.c
+    	Xext/mitmisc.c
+    	Xext/sampleEVI.c
+    	dix/window.c
+
+commit 179a082c26f9e562492ee2e59e7f44f949f39f9c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 21:13:10 2008 +0930
+
+    Xext: route event through master if required (XTestFakeInput)
+
+commit fb784d99c521823339bf00b70b9824f735d88875
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 20:57:42 2008 +0930
+
+    mi: fix typo in comment.
+
+commit 8209fdbc7c7f2dd068b30ff184b5fbf00db78686
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 20:53:57 2008 +0930
+
+    Xext: Update sprite on fake input only for MDs and floating SDs.
+
+commit 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 22 16:31:44 2008 +0930
+
+    xnest: re-enable XKB support. #10015
+    
+    XKB was disabled in 08928afb0500d46b0caa0a1d1244dee2ed80e6a0, with the comment
+    "Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
+    and changing XKB settings seems to work in Xnest now.
+    
+    X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>
+
+commit a8b8700c7345b89953c8b63cb5c347a95e6ab988
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 21 23:44:37 2008 -0700
+
+    XQuartz: Fixed cmd-tab to bring all windows forward.
+    (cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
+
+commit a368ab757edf36ed7bbda023673d28883ce11231
 Author: Dave Airlie <airlied@linux.ie>
 Date:   Tue Apr 22 15:13:57 2008 +1000
 
@@ -2229,41 +14101,596 @@ Date:   Tue Apr 22 15:13:57 2008 +1000
     (EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
     
     but thats better than X exiting in my book.
-    (cherry picked from commit a368ab757edf36ed7bbda023673d28883ce11231)
 
-commit 5a2b538c1bc020af5bc33027ba0d9698338dca46
+commit 449723510a1f9d024e23d9eb33795cac27f9443e
+Author: Egbert Eich <eich@pdx.freedesktop.org>
+Date:   Tue Apr 22 13:30:03 2008 +0930
+
+    xkb: use the correct device instead of an uninitialised "dev". #15614
+    
+    X.Org Bug 15614 <http://bugs.freedesktop.org/show_bug.cgi?id=15614>
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit ba87c25321c3378fd1ad0c55dcb0af0a6e82a540
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 21 20:03:08 2008 -0700
+
+    Make rootless use dixLookupClient rather than deprecated LookupClient.
+    (cherry picked from commit 582b5b01f9697b66489ea906a2ecb8bfc5915571)
+
+commit 8822110d7d6b684f373fc883aeb7cab9734e9ddb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 21 20:08:05 2008 -0700
+
+    Fixed dixLookupClient to work with client=NullClient as it did in the 1.3 branch
+    (cherry picked from commit e41ccc64702f856e5e09dfa652fe73c14b8a0225)
+    (cherry picked from commit ce5a5f93990647de85e535734ee6bb430ad591cb)
+
+commit 5ffb6a2fe8db5871eaf26b8535af1588c43f33d3
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Apr 21 19:55:54 2008 -0700
+
+    Nuke a call to deprecated LookupClient, and hopefully prevent a
+    null-pointer dereference, too!
+    (cherry picked from commit 3d28e9f953709914e18807bc74c241333671cb30)
+
+commit 590688131d89595bdc78ca562ee88df86c9012a6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Apr 20 22:18:45 2008 -0700
+
+    XQuartz: Fixed quit dialog to be more conforming with HIG.
+    (cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
+
+commit d20b3ac22d960fa44632cc4a14be079daa2d5a33
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Apr 20 22:18:19 2008 -0700
+
+    .gitignore: Added Xquartz stuff
+    (cherry picked from commit 0a9a3bec2de8d1f442493e13cf9f039902a4928f)
+
+commit 570b0dca261920c9b01b4eb11fe9b9987b1c636a
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Apr 21 17:52:10 2008 -0700
+
+    Fix for pointer-offset issue when using a multi-display environment on X11.app.
+    (cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
+
+commit 3f081b4de55e1378728a24d069bf06575ffca2d8
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Mon Apr 21 11:22:07 2008 +0200
+
+    EXA: Set pixmap->accel_blocked on the screen pixmap, too.
+
+commit 26c1801a27b81fdd988d5bd210ba0e76ecc274ae
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Mon Apr 21 11:03:27 2008 +0200
+
+    EXA: Update sys_pitch/fb_pitch in exaModifyPixmapHeader.
+    
+    exaModifyPixmapHeader now also only evaluates arguments that have a
+    meaningful value.
+
+commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd
+Author: Jordan Crouse <jordan.crouse@amd.com>
+Date:   Mon Apr 21 12:09:00 2008 -0600
+
+    xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
+
+commit 6c95fae1e9d6b0eb64bc78eced05a6e9f5faf02e
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Mon Apr 21 10:45:11 2008 +0200
+
+    EXA: Offscreen memory eviction improvements.
+    
+    * Make sure available areas are considered to have no eviction cost. This seems
+      to help for https://bugs.freedesktop.org/show_bug.cgi?id=15513 but I'm afraid
+      that may just be coincidence.
+    * Only calculate eviction cost of each area once for each eviction pass.
+      Safeguard against potential (though unlikely) division by zero.
+    * Cosmetic enhancements: Name eviction cost related variables 'cost' instead of
+      'score' to emphasize that smaller values are better, update Doxygen file
+      comment to the way eviction works now.
+
+commit 40c6be1408a1f0b236fdb28af27ae18aea0d578f
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Apr 20 20:36:44 2008 +0200
+
+    Minor xorg.conf manpage fixups
+    
+    Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
+    replaced, and rewrap some text to get __xservername__ replaced in the
+    description of Option "Accel" (cpp doesn't like the preceding quote).
+
+commit 4bcfed2f9cf5dbf682d3bc98873ba97c4efdff44
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Apr 20 08:35:42 2008 -0700
+
+    Revert "Removed XWin DDX"
+    
+    This reverts commit 6550078b0925f754e3eec3bbce94dbfe5de8c419.
+    
+    Doctor, I'm starting to get a pulse...
+
+commit 14396fdebac1868df17559220ed7aaa34c34251e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Apr 19 23:31:05 2008 -0700
+
+    XQuartz: Cleanup turning off COMPOSITE
+    (cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
+
+commit d13828797fe22856b07e08a55d2b9375902194bf
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 18 20:38:31 2008 -0700
+
+    XQuartz: Cleaned up some casting to get rid of compiler warnings
+    (cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
+
+commit 6550078b0925f754e3eec3bbce94dbfe5de8c419
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Apr 19 09:29:46 2008 -0700
+
+    Removed XWin DDX
+
+commit 587c010a1cd733fded4d49dc339df0634bda8be6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Apr 19 09:27:21 2008 -0700
+
+    Rootless: Kill off rlAccel
+
+commit d3d00d92586c3e1cbc88087c930b65c8b3832fcc
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Sat Apr 19 12:54:40 2008 +0200
+
+    Removed fbpseudocolor.h from sdk_HEADERS.
+
+commit 5bdc4198795ffd011bb07cffe3817e4cded87f60
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sat Apr 19 04:06:19 2008 -0400
+
+    Remove fbpseudocolor
+    
+    "An experimental pseudocolor emulation layer.  Not fully completed,
+    currently only works for 16bpp."  That was almost four years ago.
+    It still doesn't work, only one driver even attempts to use it, it
+    contains an ad-hoc implementation of damage, and should really be
+    done up in Composite now anyway.
+
+commit 60ff56050b64183cb6e58f54223c8a3ddc2e704b
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Apr 18 22:17:53 2008 -0700
+
+    Revert "Optimize dixLookupPrivate for repeated lookups of the same private."
+    
+    The patch was wildly unsafe for SIGIO, and made everything full of
+    crashy crashy fail.
+    
+    This reverts commit 9b30cc524867a0ad3d0d2227e167f4284830ab4e.
+
+commit ed9dabb47c467dbf49836b631d5d6bda4b0d98b0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 18 20:30:43 2008 -0700
+
+    Last of the spam... I promise...
+    (cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
+
+commit 49f2bb4681fdee9e45f952ef0ac9c34a090117de
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 18 20:25:38 2008 -0700
+
+    XQuartz: More sanitization of the namespace
+    (cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
+
+commit c2f0d020b5d7950267aa3df391a7a72b9ae5883b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 18 20:10:57 2008 -0700
+
+    XQuartz: Removed unneccessary include
+    (cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
+
+commit 5183fea6d38de4bcf657e9c2a983dfd81a2a223f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 18 20:06:17 2008 -0700
+
+    XQuartz: Handled sanitization of namespace better
+    (cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
+
+commit edd3fb784bad893550ee270e0a09f22f99783cf5
+Author: Ben Byer <bbyer@bbyer.local>
+Date:   Fri Apr 18 17:17:01 2008 -0700
+
+    random flailing
+    (cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
+
+commit a7503615a6893749d512f75d37646273f31b9dbf
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 18 19:56:41 2008 -0400
+
+    Death to TOG-CUP.
+    
+    If you still care about 8bpp visuals that much, fix Composite to provide
+    synthetic visuals.
+
+commit 4da9ec16e9725ebb9817b49e33ea1035b6aff09a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 18 19:54:09 2008 -0400
+
+    Remove appgroup mentions from configure.ac
+
+commit 25827fde68d3bb02a2b7e05fae53a1d97edf1f76
+Author: Eric Anholt <eric@anholt.net>
+Date:   Fri Apr 18 15:32:04 2008 -0700
+
+    Nuke the MIT-SUNDRY-NONSTANDARD extension.
+    
+    This extension provided bug-compatibility with pre-X11R6, but has been
+    stubbed out in our server since 2006 to return BadRequest when you actually
+    asked for it.
+
+commit 13adef8a17d8815f4db2aaac30ae04438e125343
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 18 19:01:06 2008 -0400
+
+    Finish deleting EVI
+
+commit eafaf40fb3368ca7e4cf48336fdb7a6c9f536bfa
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 18 18:50:05 2008 -0400
+
+    Death to APPGROUP.
+
+commit f6617b4127125516583f321c961d70f762f728be
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 18 18:28:01 2008 -0400
+
+    Death to Extended Visual Information.
+
+commit 3b93631e59ca4d312d318eac4015e0a79ad6351f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 11:31:54 2008 +0930
+
+    dix: remove coreOnly check. Core pointer must generate XI events now.
+    
+    This flag was only used when an event is generated by Warp[Device]Pointer.
+    Since the VCP now happily generates core events, this flag is obsolete.
+
+commit e0eaf8e5e3fa7a11c087851dff93f50f6907c4a5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 10:57:47 2008 +0930
+
+    Xext: Let XTestFakeInput update the sprite for XI events.
+    
+    Since XI devices can have their own sprite now, we need to update the sprite
+    coordinates too when processing an XI event.
+    Note: This doesn't deal with the device hierarchy correctly yet.
+
+commit cb0168b4ac5c59cdce6f0a6d89ddd9f30d93b5f3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 09:48:06 2008 +0930
+
+    Xext: xtest.c: death to tabs+spaces indendation, remove #define XINPUT
+
+commit eebdf69e9a52e071e0467a1f99de135df4d1eabc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 18 09:22:37 2008 +0930
+
+    xkb: mixing up src and dst in a memcpy is suboptimal.
+
+commit aa6687322de85a2d1025a3ae851fb290a089b2d3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 15 23:03:06 2008 +0930
+
+    Xi: when copying button classes, copy xkb_acts as well.
+    
+    This should be the last piece in the quest for the class copy.
+
+commit c14f5dc237a31b13d98ae2d0d6143bd91083cf13
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 20:21:45 2008 -0700
+
+    XQuartz: Forgot to commit xprEvent.[hc] ...
+    (cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)
+
+commit 22bb7608a025a4ec0f442637810b20e2cb0b0820
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 17:04:08 2008 -0700
+
+    Added XKB support for Xquartz
+    (cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
+
+commit 652479dba38470273313dc46f17e3bcb1bc5e383
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 15:49:13 2008 -0700
+
+    XQuartz: Moved some rootless-specific cruft into xpr
+    (cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
+
+commit 2a1ba20af98c0e9a6a7f1a50d32058dcc9759c21
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 15:23:00 2008 -0700
+
+    XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
+    (cherry picked from commit 7b087c965bce9f440ab5233d6383aa4a7de969b8)
+
+commit 55f80d754525398378de1ef28aa562bd29ee750f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 14:21:31 2008 -0700
+
+    XQuartz: A little more debugging output from threadSafety
+    (cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
+
+commit 0d61f6fca1efeb4f68488e323d1c0508b9b7a711
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 13:17:58 2008 -0700
+
+    XQuartz: Fixed some missing prototypes
+    (cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
+
+commit dbd4c031565d269fef90af23386ff045ec78688c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 13:12:56 2008 -0700
+
+    XQuartz: Added framework for asserting which thread we're in.
+    (cherry picked from commit 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
+
+commit fa0645b452cbebd1800a63f1c95cb77fef4ab211
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 12:27:12 2008 -0700
+
+    removed Xquartz debugging code that leaked into master.  Our Bad.
+
+commit a3d40f0549f6c6f49fffc286bcdaad758fa92367
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 11:56:48 2008 -0700
+
+    XQuartz: Include version info for CrashReporter
+    (cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
+
+commit 6d11712c2a35b243c19eea3b26622d18c2446dbe
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 11:06:54 2008 -0700
+
+    XQuartz: Use strerror(errno)... cause I like text more than grepping header files
+    (cherry picked from commit 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
+
+commit dcf4f917cc9488de72711255bbb030d9aa8f8bfb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 17 11:03:31 2008 -0700
+
+    merged darwinKeyboard.[ch] into quartzKeyboard
+    (cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
+
+commit 582397cd024c68df65ab9dececd6d2c40a5a261b
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 02:31:53 2008 -0700
+
+    oops, missed a spot
+    (cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
+
+commit 0bd1c369cce05d5a4da5e3fd7033aea8c68460ec
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 02:30:36 2008 -0700
+
+    formatting cleanup
+    (cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
+
+commit 700e14c22616b209867e4ea4d1811e53ca996164
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 02:21:33 2008 -0700
+
+    delete debugging spew
+    (cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
+
+commit a440eebf2541ae0bb06bf65281b5facff2f04e00
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 02:21:11 2008 -0700
+
+    add support for horizontal scrolling (buttons 6 and 7)
+    (cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
+
+commit 612e901ef6aa3edc54b39e55e8040cda0e5ab7b6
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 01:32:56 2008 -0700
+
+    enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
+    (cherry picked from commit ab662c736e0654e2b4347091f0d9e87f26034216)
+
+commit 5bdfbfbedcbd9ff61cbb0b678cbf7ce7889a5826
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 01:29:46 2008 -0700
+
+    darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
+    (cherry picked from commit a8a090b853e811b9843a5732572cbbe542224f32)
+
+commit 58e42683c9e998f6b8a55d5653b9caec7b6acf96
+Author: Ben Byer <bbyer@apple.com>
+Date:   Thu Apr 17 00:19:56 2008 -0700
+
+    hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
+    (cherry picked from commit cab54466a61281cfafc12825017c23d720cd75f4)
+
+commit cd3470a0cffbd6b8cec7c44227b33307c9e227ae
+Author: Ben Byer <bbyer@apple.com>
+Date:   Wed Apr 16 22:48:54 2008 -0700
+
+    kludge: miEqEnqueue wants a device, even if we're passing custom messages,
+    so give it one
+    (cherry picked from commit a494ff04b2a14470eaf5a23c7cf6dbdea182c6d1)
+
+commit 966ae1781f3ca563e15a9a1b8cab6fab94e07fe9
+Author: Drew Parsons <dparsons@debian.org>
+Date:   Mon Mar 10 22:54:49 2008 +1100
+
+    Create dix/libXpdix.la for Xprint-specific build of libdix.la
+    
+    (cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)
+    
+    required because of commit 7c0709a736c0f3aa011de67dd2c2962585ab146e,
+    which made requestingClient in dix specific to Xprint only.
+    Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
+    $(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.
+    
+    Follows 571206832d454771e3c638c7515767958365c19c (providing -DXPRINT
+    to xprint subdirs).
+    
+    Note it may be possible to restructure the code so that
+    requestingClient is stored elsewhere than in dix. See discussions
+    following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
+    If this is done it may be possible to revert this commit (if not 571206...).
+
+commit 571206832d454771e3c638c7515767958365c19c
+Author: Drew Parsons <dparsons@debian.org>
+Date:   Mon Mar 10 13:48:05 2008 +1100
+
+    Define XPRINT in XPRINT_CFLAGS (configure.ac)
+    
+    -DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
+    After commit 7c0709a736c0f3aa011de67dd2c2962585ab146e it is also
+    required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
+    defined, so make it a global Xprint definition in configure.ac.
+    (cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
+
+commit 9b30cc524867a0ad3d0d2227e167f4284830ab4e
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Thu Apr 17 16:10:10 2008 +0200
+
+    Optimize dixLookupPrivate for repeated lookups of the same private.
+    
+    This gives me a 20% speedup for EXA text rendering, though I still seem to burn
+    quite a lot of cycles in here...
+
+commit 886af8f3849a0fcfc6b63a9695107ce26d7a6955
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Wed Apr 16 16:20:19 2008 +0200
+
+    EXA: Avoid some fallbacks in exaCopyNtoN.
+    
+    In some cases we can still do the copying in hardware even if the
+    dimensions of the pixmaps are out of range. This is true when the boxes
+    that we're to copy are all in the card's range.
+
+commit dc10f0a0e243b7ba38d02a4e2c43027563aead7c
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Apr 17 11:13:47 2008 +0200
+
+    Fix composite on !darwin
+    
+    2ffdb0eb641ab6949783b4eb574f77e7486ac929 changes the default value of
+    COMPOSITE to 'auto', but doesn't set it back to 'yes' as appropriate.
+
+commit 8716d081fdf61ddf956c30aff7697c70507911fd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Apr 3 16:29:43 2008 -0700
+
+    XQuartz: Don't enable rootless accelerated functionality... crashy...
+    (cherry picked from commit cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
+
+commit 2ffdb0eb641ab6949783b4eb574f77e7486ac929
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 16 21:54:00 2008 -0700
+
+    XQuartz: Don't use composite.
+    (cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
+
+commit 757a1bf3a3d72e17eeb362f825124c4ba40cc080
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 16 21:48:52 2008 -0700
+
+    Xquartz: Don't need to link against rlAccel since we don't use it
+    (cherry picked from commit 180ec128adef11a9a90cea1189dc31ac5de8359f)
+
+commit ab8c6a3c5acb2a3bf288f1d6339b09a125bbb930
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Apr 14 19:12:00 2008 -0700
+
+    Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version
+
+commit b907258ebe62642af088f6e2970a45a68cf4be19
+Author: Eric Anholt <eric@anholt.net>
+Date:   Wed Apr 16 12:07:51 2008 -0700
+
+    Update dolt from upstream, fixing fallback to libtool.
+
+commit e1e189f8538f2b77ae0cf0d846d3899061e4c4b7
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Apr 15 14:49:51 2008 -0700
+
+    Include pciaccess in the xorg-server.pc Requires line.
+    
+    This pulls in the include path for pciaccess.h, which is needed by, among other
+    things, xf86.h.
+
+commit 9e7ced94a5e3a14762fe934aa69d91f0831cf5ca
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Apr 15 12:06:07 2008 -0700
+
+    XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
+    (cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
+
+commit 51c8fd69ec9292f5e18cdc7f60e1716fbd6ae61a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 15 15:09:40 2008 +0930
+
+    dix: free the unused device classes when closing a device.
+    
+    This also requires to NULL-ify all pointers while we're actually using them,
+    otherwise we'd try to free them twice.
+
+commit 48d33ab9b672b3b3ca308000cdbd573d1e368ff9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 15 14:29:53 2008 +0930
+
+    dix: float attached devices _before_ disabling the master.
+    
+    It also helps if we're actually providing the correct argument to
+    AttachDevice...
+
+commit 4cf9c5909d926ec322ed1c7df47f95bd872bb607
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 15 13:56:11 2008 +0930
+
+    Xi: fix up button count.
+    
+    Some leftover code from the previously used alloc/free device classes left us
+    with a incorrect button count. So a button release didn't come through if
+    a different pointer was moved after the button press.
+
+commit 35982bc109d424c464551ab22ec90af69908c884
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Fri Apr 11 11:09:13 2008 -0400
 
     Make DRI2 a serverlayout/serverflags option.
     
     Add xf86DRI2Enabled() to export the value of the setting.
-    (cherry picked from commit 35982bc109d424c464551ab22ec90af69908c884)
 
-commit 46b74e84508b614b125e71fd0f3e0cc4fc3fe5b5
+commit f133d85778462134f366389bde7673bff7845fa8
 Author: Tilman Sauerbeck <tilman@code-monkey.de>
 Date:   Mon Apr 14 11:43:51 2008 +0200
 
     EXA: Update pixmaps' accel_blocked field in ModifyPixmapHeader.
-    (cherry picked from commit f133d85778462134f366389bde7673bff7845fa8)
 
-commit 4161c9781be6afea9647307152f85cf8f1b20a3a
+commit bb8868540f017b121d698da45e552ffb55a57cea
 Author: Tilman Sauerbeck <tilman@code-monkey.de>
 Date:   Mon Apr 14 09:58:49 2008 +0200
 
     EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8.
-    (cherry picked from commit bb8868540f017b121d698da45e552ffb55a57cea)
 
-commit 32604d0f1397c5b5b944a78a47caf1db324312f7
+commit 1a9d7205cd5640eb65f019336097d86301942ea7
+Merge: 90f491c 6866e84
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 14 16:25:58 2008 +0930
+
+    Merge whot@wombat:~/potoroo/xserver into mpx
+
+commit 3e12c5bb67f3049156475d5cbf4e899aaded76bb
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Mon Apr 14 11:45:12 2008 +1000
 
     glx: silly nitpick...
     
     even though i and j are the same, we use i to derefence visuals everywhere else
-    (cherry picked from commit 3e12c5bb67f3049156475d5cbf4e899aaded76bb)
 
-commit 738aea7a94bf07a986c7b7d83346b86337d65d1e
+commit 97565c0f394f16d042c614695c8b7b4ac354f2a3
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Mon Apr 14 11:40:38 2008 +1000
 
@@ -2271,9 +14698,8 @@ Date:   Mon Apr 14 11:40:38 2008 +1000
     
     Finally glxinfo returns the set of 3 visuals and glxgears works again for me on
     sw rendering
-    (cherry picked from commit 97565c0f394f16d042c614695c8b7b4ac354f2a3)
 
-commit d6916b149d2fac9812d7d43a8a40df0b0836550f
+commit c61087c82784633e522bd9392172b43656bdf45e
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Mon Apr 14 10:47:28 2008 +1000
 
@@ -2284,9 +14710,106 @@ Date:   Mon Apr 14 10:47:28 2008 +1000
     
     This at least makes glxinfo on glcore return sensible information, it doesn't make
     gears work yet though.
-    (cherry picked from commit c61087c82784633e522bd9392172b43656bdf45e)
 
-commit db00d4a4dc3af66ff8a0613576a3e05cfd5245be
+commit 6866e84e3c607d00d88eab2249c2619d6707c1a4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 19:57:51 2008 +0930
+
+    Xi: store feedback classes in devProviates system as well.
+    
+    This is a follow-up to cb48d880856fd196ab8e8de5eb1f14944a1b4fff.
+
+commit cb48d880856fd196ab8e8de5eb1f14944a1b4fff
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 19:48:28 2008 +0930
+
+    Xi: store unused classes in devPrivates.
+    
+    Rather than freeing/allocing classes each time the device capabilities need to
+    swap, store them in the devPrivates system.
+    When a class is unused, it is pushed into the devPrivates, and later recovered
+    when needed again. This saves us a lot of memory allocations/frees, admittedly
+    on the cost of some memory.
+
+commit fde3c836628b6cdec3e5d107d6b1b99bc8b86912
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 17:08:51 2008 +0930
+
+    Xi: copy the KeySyms.map over from the source.
+
+commit 3c4c9938f31755c5a59995fdcfa138c99db76bbf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 16:52:14 2008 +0930
+
+    Xi: Fix pointer handling in KeyClassRec copy.
+    
+    We don't free the class anymore, so just store the previous pointers, do the
+    memcpy from the SD and then restore the pointers.
+    Plugs a memleak too, before xkbInfo was never freed.
+
+commit 755f9e5d7898056cf3bead69ce25a10e23995582
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 16:49:25 2008 +0930
+
+    dix: Ignore focus for passive grabs if the event is a pointer event.
+
+commit 6faf5b97b92953c331d6540ceb18fd0a77197fea
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 15:42:33 2008 +0930
+
+    Xi: fix up modifierKeyMap copying.
+    
+    Setting it to NULL isn't correct either. The correct behaviour is to realloc
+    it to the size necessary (or newly alloc it/free it).  Otherwise we have a
+    memleak.
+
+commit 3106ba1116e3b9d893f66a93e4a91cc61e23226a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 11:48:06 2008 +0930
+
+    xkb: two fixes to avoid server crashes.
+    
+    - map can be NULL in some cases, so don't try to dereference it.
+    - don't default to inputInfo.keyboard
+    
+    This is firefighting, I presume something in the class copy may have gone
+    wrong to get a NULL map in the first instance?
+
+commit 415c6df0da1197d487456b4c48e2e28e7ded8b8e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 11:46:44 2008 +0930
+
+    Xi: copy feedback classes first, in some cases xkb relies on kbdfeed.
+    
+    XkbInitIndicatorMap (in XkbInitDevice) calls XkbFindSrvLedInfo. This accesses
+    the devices kbdfeed struct, which is all nice and dandy if it is NULL. When
+    copying the device classes however, kbdfeed may not be NULL and thus
+    XkbFindSrvLedInfo goes on its merry way to do whatever it does.
+    
+    By copying kbdfeed first, we avoid XkbFSLI to reference the "old" kbdfeed
+    struct of the previous SD.
+
+commit 961f6660902163e99727c2dcc1a039f32b083859
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 09:31:16 2008 +0930
+
+    Xi: modifierKeyMap needs to be set to NULL when copying classes.
+    
+    Otherwise we have a double reference to the same memory area.
+
+commit bf6679cba40a936d46008c886d204ed521a4971a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 08:28:07 2008 +0930
+
+    Xi: copy the XkbSrvLedInfo too when copying device classes.
+
+commit 4219e94c2f7d431be433eceddfe79760a1ee31a1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Apr 13 08:27:31 2008 +0930
+
+    xkb: Add XkbCopySrvLedInfo, deep-copies a XkbSrvLedInfoRec.
+
+commit 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Sat Apr 12 20:39:18 2008 +0200
 
@@ -2294,15 +14817,33 @@ Date:   Sat Apr 12 20:39:18 2008 +0200
     
     It seems Intel C Compiler neglects to define __amd64__, __amd64, or
     amd64, but *does* define __x86_64__.
-    (cherry picked from commit 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe)
 
-commit d2f44719336a800a3c9e7ba4c772f74615e91530
-Author: Tilman Sauerbeck <tilman@code-monkey.de>
-Date:   Thu Apr 10 21:36:19 2008 +0200
+commit b1f3f42840ec01db417345a0740b59ad5e4471cb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Apr 11 17:49:51 2008 -0700
 
-    Fixed configure.ac for autoconf 2.62.
+    Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
+    (cherry picked from commit 55d9973b053f25bb95b26e00351dc5531caf5b04)
+
+commit eabcfce0a68d504d11be9479f09e66f574dd2f21
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 11 09:51:26 2008 -0400
+
+    Stop building mfb/afb/xf1bpp by default.
 
-commit 099d1bef220700c5db6e6f01226690a15eab2ea5
+commit 0dab6fa3582b70ccd0f01459902415c28dbc81ff
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 11 09:47:51 2008 -0400
+
+    So long, and thanks for all the cfb.
+
+commit 059b4876e6350aa1110648788cdfbb3f45b4d66d
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Apr 11 09:46:48 2008 -0400
+
+    Add doltcompile to .gitignore
+
+commit 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Fri Feb 22 11:01:51 2008 +1030
 
@@ -2318,18 +14859,168 @@ Date:   Fri Feb 22 11:01:51 2008 +1030
     checkCoreInputDevices.
     
     X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
-    (cherry picked from commit 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae)
 
-commit 566037a914742ed3299dc24a18e828920b531293
-Author: Dave Airlie <airlied@linux.ie>
-Date:   Wed Apr 9 14:27:58 2008 +1000
+commit 90f491cf8eb869f27c4278b26c1bb84432b12d63
+Merge: cbe01b3 b4380d8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 11 08:29:52 2008 +0930
 
-    quirk: add quirk for ACR 640x350 default mode is wrong
+    Merge whot@wombat:~/potoroo/xserver into mpx
+
+commit 3c337e18b933881e22b0d03312511f1d23a8640b
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Thu Apr 10 21:36:19 2008 +0200
+
+    Fixed configure.ac for autoconf 2.62.
+
+commit 13dcde6bf994fae09c67c3edce9de42df61ef043
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Apr 10 11:08:49 2008 -0700
+
+    Fix dolt to error out on compile error, and not print errors on race to mkdir.
     
-    RH #440186
-    (cherry picked from commit b19027fbaea4c3a146926e862983e0e3411fff3d)
+    Both of these changes have been submitted upstream.
+
+commit a7e3ad1c6b455bda7c4abb352a20845d1d4574a0
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Apr 10 10:33:11 2008 -0700
+
+    Remove NDEBUG (assert() disable) define from the X Server.
+    
+    A few pieces of code were abusing this define for other purposes, which are
+    converted to #ifndef DEBUG instead.  There should be no ABI consequences
+    to this change.
+    
+    The rationale is that having the define in xorg-server.h also disables
+    assert() drivers, which is unexpected, and also difficult to avoid since
+    xorg-server.h is included in their config.h, and you can't put a #undef in
+    config.h.  As for removing it from the server instead of moving it to an
+    internal header, we probably shouldn't have unnecessary assert()s in
+    critical server paths anyway, and if we do we could #define NDEBUG in the
+    specific cases needed.
+
+commit b4380d8030927c940ddaea83c4cf24e0b9eb7b96
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 19:25:43 2008 +0930
+
+    dix: don't free MDs classes on init.
+    
+    The device classes aren't deleted anymore on a class change, so there's no
+    need to store the MD's original classes. We should however restore the MD to
+    sane defaults when disconnecting the last device, consider this as TODO item.
+
+commit 04dff74ffdf727015e3721aae4ea13acc498cd1c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 19:22:59 2008 +0930
+
+    dix: Rework Enter/Leave semaphore system.
+    
+    Instead of a simple counter, use bits to keep track of which device is where
+    etc. When device enters a window (or sets focus), the bit matching the device
+    is set, when it leaves again, it is unset. If there are 0 bits set, then
+    Leave/Enter/Focus events may be sent to the client.
+    
+    Same theory as before, but this should get around the insanity with
+    Grab/Ungrab special cases. Those cases are basically untested though.
+
+commit a88386ee277d136caaaeec305f8753f23f9b6274
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 14:36:57 2008 +0930
+
+    Xi: only DeliverFocusedEvents if the event is not a pointer event.
+    
+    A pointer device may have a focus class, but even if so, pointer events must
+    be delivered to the sprite window, not the focus window.
+
+commit 48249425275cc90242497aee9968e5f1ffc86698
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 14:36:10 2008 +0930
+
+    Xi: dont copy FocusClassRec if the master already has one.
+    
+    Blindly copying will override the focus setting of the master. If there's XI
+    applications running, they may set the SD focus, while leaving the
+    MD's focus as it was. In this case, after a class swap we still want to get
+    the MD's events to the same window as before.
+
+commit bce6091c6b04ff2db704ae4f161179d21dcbec59
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 09:59:45 2008 +0930
+
+    dix: Extend IsKeyboardDevice() to not include pointer devices.
+    
+    If a pointer devices has key classes as well, don't register it as a keyboard
+    device. Let's see how much that change will break.
+
+commit cc7dab2d04da4ca164eeec1a3296df1706585466
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 09:58:50 2008 +0930
+
+    dix: Dont deliver grabbed pointer events to a focus window.
+    
+    If an pointer event is being processed during a device grab, don't deliver it
+    to the focus window, even if the device has a focus class. Reason being that
+    some pointers may have a focus class, thus killing drag-and-drop.
+
+commit df2545b98d888924209cb889a68737c15f1aa209
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 08:50:43 2008 +0930
+
+    xfree86: Sanity check before retrieving the paired device.
+    
+    Some pointer devices send key events [1], blindly getting the paired device
+    crashes the server. So let's check if the device is a pointer before we try to
+    get the paired device.
+    
+    [1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
+    the pointer device, not through the keyboard device.
+
+commit 5a4c6621aaf4e886f2c3b633e837ba359fedf921
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 08:29:05 2008 +0930
+
+    Xi: some extra checks for validity of kbd and mouse.
+    
+    Floating SDs are paired with themselves, so the paired device may not be a
+    proper keyboard or mouse. Put some extra checks in to avoid dereferencing a
+    nullpointer later.
+
+commit 8e0a6529303a52acc10905dd47c72a0d60979676
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 08:25:36 2008 +0930
+
+    dix: When floating, set sprite to NULL before calling InitializeSprite.
+    
+    InitializeSprite won't create a new one if it already exists, with the result
+    of overwriting the master's sprite. This master sprite is then assigned to the
+    floating slave, and freed when the slave is reattached later.
+    Setting the sprite to NULL forces InitializeSprite to alloc a new one, and
+    this one can be freed without further repercussions.
+
+commit e7211eb0b3d10323dab681bcb18580405ea18ab2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 10 08:08:54 2008 +0930
+
+    Xi: When attaching, check for ptr -> ptr and keybd -> keybd.
+    
+    Some pointer devices have key classes (e.g. MS Optical Desktop 2000). The
+    previous test was performed as Error if ptr -> keybd or keybd -> ptr. This
+    doesnt work with such devices. New test is Succeed if ptr->ptr or
+    keybd->keybd.
+
+commit 7909ebe7f163716520f843fae11ac7bdeffcb57c
+Author: Eric Anholt <eric@anholt.net>
+Date:   Wed Apr 9 10:43:25 2008 -0700
 
-commit 032732270851ec2a12fc36e421f7335a2bd6ec34
+    dolt: add FreeBSD support (this and ppc have been submitted upstream).
+
+commit b4842d8dc3b1619033c5c123c8adc6e164098dc3
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Wed Apr 9 16:17:35 2008 +0200
+
+    dolt works on powerpc Linux.
+
+commit 0d1746995d91b55e40f233f0c38b56bafe896d38
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Wed Apr 9 13:37:59 2008 +0200
 
@@ -2337,16 +15028,183 @@ Date:   Wed Apr 9 13:37:59 2008 +0200
     
     Fixes memory corruption reported at
     http://bugs.freedesktop.org/show_bug.cgi?id=14004 .
-    (cherry picked from commit 0d1746995d91b55e40f233f0c38b56bafe896d38)
 
-commit 85b855f26f1578d52e9ed1dd0e3a9a1340ef1a2d
+commit 6d031cbdefd8072b61645955f01b470a3e6858c1
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Apr 9 14:36:26 2008 +0300
+
+    configure.ac: Do the dolt
+    
+    Use dolt instead of libtool whereever practical.  See:
+    http://lists.debian.org/debian-devel/2008/04/msg00286.html
+
+commit b19027fbaea4c3a146926e862983e0e3411fff3d
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed Apr 9 14:27:58 2008 +1000
+
+    quirk: add quirk for ACR 640x350 default mode is wrong
+    
+    RH #440186
+
+commit 1f8188656a075dc7b1bb27a0795b5bd43610bbc8
+Author: Ben Byer <bbyer@apple.com>
+Date:   Tue Apr 8 20:37:25 2008 -0700
+
+    add missing dix-config include
+    (cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
+
+commit cbe01b3083eb65c9d4259b1071683febebf11600
+Merge: 5ffbcfe 389dae7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 9 10:46:46 2008 +0930
+
+    Merge whot@wombat:~/potoroo/xserver into mpx
+
+commit 3f51f493b6daf2464e6c2ba5a924219b88a9e57e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Apr 8 17:02:56 2008 -0700
+
+    XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
+    (cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
+    (cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
+
+commit 389dae73cc0f3693f49807fd2de146c454ba9783
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 9 08:26:00 2008 +0930
+
+    Xi: If device "to" has a class but "from" doesn't, free the class in "to".
+
+commit 60c38d248c1a89392c2c6695c3802f4b54e4c00b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 9 07:46:53 2008 +0930
+
+    Xi: plug memory leak, free previous motion history before allocating new.
+
+commit ea05cf0813b2b7c8cd2151cb935820753ae7997a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 8 22:09:11 2008 +0930
+
+    Xi: check if source has a key class before copying.
+
+commit 08073862f8c4e1219b6459708ffd28e2bc35885f
+Author: Hasso Tepper <hasso@estpak.ee>
+Date:   Tue Apr 8 13:00:38 2008 +0300
+
+    configure.ac: Fix monotonic test harder
+    
+    This was only introduced in a later version of POSIX, so define that
+    version to get it from more conformant systems.
+
+commit 5ffbcfec3d37d3b627a78acfa00dbafc5948df82
+Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
+Date:   Tue Apr 8 14:42:00 2008 +0930
+
+    dix: Ensure Proximity events don't kill the server.
+    
+    Add Prox events to the if-clauses with the other events
+    that are usually sent from the input devices.
+    Ensure that the event deliverers won't try to deliver
+    events of type '0' (some extended events doesn't have
+    an equivalent core-type)
+    
+    Small modification by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 32e4a88ae613c7200d84d5621344b418b656346b
+Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Date:   Tue Apr 8 08:42:58 2008 +0930
+
+    xkb: don't overwrite CtrlProc in the second run of XkbFinishDeviceInit.
+    
+    XkbFinishDeviceInit is called once when the device is initialised, but also
+    when a class copy causes the key class of a device to change. In this case,
+    overwriting the CtrlProc of the KeybdFeedbackClass with XkbDDXKeybdCtrlProc
+    sets up a nice recursive loop of XkbDDXKeybdCtrlProc calling itself until the
+    cows come home.
+
+commit 6271df6953bea462be7e9e01744e5dd46841e867
+Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Date:   Tue Apr 8 08:42:58 2008 +0930
+
+    xkb: don't overwrite CtrlProc in the second run of XkbFinishDeviceInit.
+    
+    XkbFinishDeviceInit is called once when the device is initialised, but also
+    when a class copy causes the key class of a device to change. In this case, overwriting the CtrlProc of the KeybdFeedbackClass with XkbDDXKeybdCtrlProc sets up a nice recursive loop of XkbDDXKeybdCtrlProc calling itself until the cows come home.
+
+commit 726dcd9e4ebfb09c0685450dca6e9fae7e773814
 Author: Adam Tkac <atkac@redhat.com>
 Date:   Mon Apr 7 10:20:02 2008 -0400
 
     Fix Xvfb input when building against current X sources.
-    (cherry picked from commit 726dcd9e4ebfb09c0685450dca6e9fae7e773814)
 
-commit fe87d921da97f498e860270e2eeb73a860f19989
+commit 0f87b41a432a6472a15ec0c9dee997e3bddbd0f2
+Author: Hasso Tepper <hasso@estpak.ee>
+Date:   Mon Apr 7 14:09:04 2008 +0300
+
+    configure.ac: DragonFly BSD support
+    
+    Add support for DragonFly BSD, which is just the same as FreeBSD for all
+    of these cases.
+
+commit 6b1a27023e48b661c4bb3b61181ac57608d8e448
+Author: Owen W. Taylor <otaylor@fishsoup.net>
+Date:   Thu Apr 3 14:50:05 2008 -0400
+
+    EXA: Fix TS origin computation when implementing RenderComposite with tiling.
+
+commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab
+Merge: b46a009 6c0cfe3
+Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Date:   Mon Apr 7 07:56:41 2008 +0930
+
+    Merge branch 'master' into dcdc_rework
+    
+    Conflicts:
+    
+    	Xext/xevie.c
+    	dix/dispatch.c
+
+commit 539bf3c2836727e7560c64144071b086f8ea32fe
+Merge: 3ab33e7 6c0cfe3
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Mon Apr 7 00:10:16 2008 +0200
+
+    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
+
+commit 3ab33e7cd46c25dfc461b2a1b13e138225a94524
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Sun Apr 6 23:23:47 2008 +0200
+
+    Remove stale code
+    
+    The jstk code for Joysticks is not used by any module, was never actually compiled and uses an API
+    that is deprecated these days.
+    
+    No reason to keep it.
+
+commit b46a00918691cbd5ca80b6d3acae7614f93e073b
+Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Date:   Sun Apr 6 09:02:57 2008 +0930
+
+    dix: sprite may be NULL, don't dereference it then.
+    
+    In some rare cases (e.g. when the init fails) a device's sprite is NULL,
+    dereferencing it to xfree the spriteTrace is a bad idea then.
+
+commit 638a50552e3e2190eac9721deb72e7365bdd52e4
+Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Date:   Sun Apr 6 08:36:21 2008 +0930
+
+    dix: remove debug error message about XI->core type conversion.
+
+commit 8f38feb3e464986dc523dabd3447ba13263a3a4a
+Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Date:   Sat Apr 5 20:37:09 2008 +1030
+
+    Xi: add comments for DeepCopyDeviceClasses, ChangeMasterDeviceClasses.
+
+commit 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Fri Apr 4 19:01:40 2008 +0200
 
@@ -2354,9 +15212,8 @@ Date:   Fri Apr 4 19:01:40 2008 +0200
     
     We need to define _POSIX_C_SOURCE on glibc, not just Linux, so add a new
     test for the __GLIBC__ macro.
-    (cherry picked from commit 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459)
 
-commit 9a908769e62fe56930ad3a2d3375e29119a2fe09
+commit cc7c045bae01d90d8f1b750080ba48a96e983c68
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Apr 4 12:58:12 2008 -0400
 
@@ -2364,9 +15221,8 @@ Date:   Fri Apr 4 12:58:12 2008 -0400
     
     The top bit of 0xCF8 is an enable bit, not part of the domain.  Sending
     cycles to domain 128 instead of domain 0 is rarely the right thing to do.
-    (cherry picked from commit cc7c045bae01d90d8f1b750080ba48a96e983c68)
 
-commit bd91565ac8dc66babb011bfc63bcc071b7bf6d32
+commit d1de3dda8efe501d4192c8a99c34ab4265316c32
 Author: Eric Anholt <eric@anholt.net>
 Date:   Mon Mar 17 14:22:39 2008 -0700
 
@@ -2375,131 +15231,181 @@ Date:   Mon Mar 17 14:22:39 2008 -0700
     For non-Linux, _POSIX_C_SOURCE and friends restrict symbols defined rather
     than enabling defines of symbols.  Additionally, CLOCK_MONOTONIC was
     apparently added to the standard around 2000 anyway, not 1993.
-    (cherry picked from commit d1de3dda8efe501d4192c8a99c34ab4265316c32)
 
-commit b2704de8a7425988ab725bfad949976dba1c0c97
+commit ec17900f52bbd25d07566834756e5c7e832e0463
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Fri Apr 4 10:46:45 2008 -0400
+
+    Convert __DRIconfigs after we've made sure createNewScreen succeeded.
+
+commit 16a8ce75585ea360c39e0ffce4f7bb26a359b754
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Apr 3 16:44:32 2008 -0400
+
+    Only autoload RECORD if it was enabled.
+
+commit d0395a753079f291a78d9ab86810b5f84f237491
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 4 15:05:26 2008 +1030
+
+    Xi: realloc to->valuator instead of allocing it blindly.
+
+commit 502689847b86be5619da7134646d55a1ac322a2c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 4 15:01:53 2008 +1030
+
+    Xi: ALLOC_COPY_CLASS_IF should only alloc if to->field doesn't exist.
+
+commit 035b1b6995e670ce5593e8aceb08f9ec812c70ea
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 4 15:00:06 2008 +1030
+
+    Xi: remove duplicate copying of kbdfeed and ptrfeed.
+
+commit 52fc7aed18930fc9e6bcfdd5dbc28ae559978288
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 4 14:47:23 2008 +1030
+
+    Xi: only alloc memory for feedback classes if it doesn't already exist.
+
+commit 4eb87c8693b57d9354832c76417797394656333e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 4 14:20:18 2008 +1030
+
+    Xi: don't free device classes before copying them.
+    
+    First commit in a series to come.
+
+commit f0915fb3c4a9712200882440a64d11dc595a02bb
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Fri Apr 4 09:29:51 2008 +1000
 
     quirk: add quirk for ACER EDID
-    (cherry picked from commit f0915fb3c4a9712200882440a64d11dc595a02bb)
 
-commit 8ccdaa288a63cad64dd5685b5b5bcb060e3793ff
-Author: Hong Liu <hong.liu@intel.com>
-Date:   Wed Apr 2 10:43:19 2008 +0800
+commit 2e42b67b82db0f9128dd00e339b9dfdd9fe6d667
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 2 18:05:34 2008 -0700
 
-    Bug #15160: quirk Proview AY765C
-    
-    prefer first detailed timing
-    (cherry picked from commit ebc56aca8bdfec1918cac3c8380895dfddea48ce)
+    XQuartz: Change reporting of space change to debug log rather than stderr
+    (cherry picked from commit ed15556a9fc4ebdb88f42961052fc8456082165f)
 
-commit 8059b57f9ba85663ee3ef8dccb46ed915368965d
-Author: Goneri Le Bouder <goneri@rulezlan.org>
-Date:   Tue Apr 1 20:19:40 2008 +0200
+commit c737d04c758e03e32f692a31ed2a665ccbafa931
+Author: Ben Byer <bbyer@apple.com>
+Date:   Tue Apr 1 00:40:46 2008 -0700
 
-    xfree86: don't crash in AutoConfig if the primary device is not pci
-    
-    Only call matchDriverFromFiles() if we found a pci device.
-    Debian bug#472823 (http://bugs.debian.org/472823).
-    (cherry picked from commit 9500033b9ecdfaf5a56a4355ffc94d74cb17ca17)
+    The AppKit thread should not be calling directly into the X server
+    functions to change state when the keyboard is reloaded; instead,
+    pass it as an event.
+    (cherry picked from commit 7e653f806ff5508aace059312156f319a9ed4479)
 
-commit 841aa08ea435e1f1bf11d2f56c6df1e66c2de020
-Author: Fredrik Höglund <fredrik@kde.org>
-Date:   Mon Mar 31 21:24:59 2008 +0200
+commit 15b0084f1ab23042190d8beeb3f088b92dee5a10
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 23:31:25 2008 -0700
 
-    EXA: Optimize the eviction scanning loop in exaOffscreenAlloc.
-    
-    Reduce the cost of the inner loop, by keeping a set of pointers to the
-    first and the last areas in the series, subtracting the cost of the first
-    area from the score, and adding the cost of the last area while walking
-    the list.  This commit also moves the scanning loop from exaOffscreenAlloc
-    into a separate function.
-    
-    Idea by Michel Dänzer.
-    (cherry picked from commit 8074676d2df8d577b443e3fa5e22d7c71c944bd1)
+    formatting cleanup for X11Application.m (no code changes)
+    (cherry picked from commit eb083d3f68f459d90417558da1ed00729b749950)
 
-commit 2e4b72dd8485df1f89ce4533a5778514ad1fc917
-Author: Fredrik Höglund <fredrik@kde.org>
-Date:   Mon Mar 31 21:15:50 2008 +0200
+commit e9e2d88436597875f102085d216dc0a8fce1450a
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 22:55:24 2008 -0700
 
-    EXA: Improve the algorithm used for tracking offscreen pixmap use.
-    
-    Replace the current score keeping algorithm with a rolling counter that's
-    incremented in ExaOffscreenMarkUsed, with the previous value being stored
-    in the area.  exaOffscreenAlloc uses the difference between the counter
-    value and the value in the area when deciding which area to evict.
-    It now also takes the size of the areas into account, and favors evicting
-    smaller areas.
-    
-    The credit for these ideas goes to Michel Dänzer.
-    (cherry picked from commit 93d876891dbba41b920a9a29a5de77f647f43928)
+    moved and renamed QuartzMessageServerThread to
+    DarwinSendDDXEvent to make more clear what it actually does.
+    (cherry picked from commit bee2b377efc930e25017636e5112093a3a6549c7)
 
-commit 32b5c67145a5386613153592444c7a9b718d425a
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Fri Mar 28 10:23:36 2008 +0200
+commit c1be4e3379d8780dff20390939b657ca0973995a
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 21:04:37 2008 -0700
 
-    gitignore: Add two more bits
-    
-    Get slightly better at ignoring vim swap files, and let people keep
-    local changes if they want to.
-    (cherry picked from commit 7034484f0887ea0f8ab956515f2d9301ea5842ce)
+    shovelling code around ...
+    (cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
 
-commit a2fcdfd5f9b98851f0e7e2b9b692fe4150a2ca0b
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Thu Mar 27 15:18:39 2008 +1000
+commit 985c631b2e1f113039e6e620f030505435fd9815
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 20:18:58 2008 -0700
 
-    quirk: fix LPL monitors properly.
-    
-    no point having a h cm fix when we really want to copy the sizes from the
-    other place.
-    
-    RH BZ 435216
-    (cherry picked from commit c747030a49dd289e873e2b686cd129d840e55468)
+    just a bit of juggling headers around -- we're preparing
+    to call our Xquartz-specific event handlers directly
+    as mieqHandlers
+    (cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
 
-commit db62e494ffb087c41dcab21aa075df93ca6ff09e
-Author: Hasso Tepper <hasso@estpak.ee>
-Date:   Mon Apr 7 14:09:04 2008 +0300
+commit 89f1d880e83e32b72d35c4dbd6795defa6efa847
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 19:47:28 2008 -0700
 
-    configure.ac: DragonFly BSD support
-    
-    Add support for DragonFly BSD, which is just the same as FreeBSD for all
-    of these cases.
-    (cherry picked from commit 0f87b41a432a6472a15ec0c9dee997e3bddbd0f2)
+    nuke DarwinEventQueue
+    (cherry picked from commit 1e0ec02202eeaffae480048b91bf02140ee29f8a)
 
-commit 685a04c2bfa779203bd6101f065b682cc0552514
-Author: Owen W. Taylor <otaylor@fishsoup.net>
-Date:   Thu Apr 3 14:50:05 2008 -0400
+commit 8944b77ec0c18476a25ba3179bcc45b338be22b8
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 2 17:47:42 2008 -0700
 
-    EXA: Fix TS origin computation when implementing RenderComposite with tiling.
-    (cherry picked from commit 6b1a27023e48b661c4bb3b61181ac57608d8e448)
+    continue with gutting darwinEvents.c
+    (cherry picked from commit c34fce7051b996633291dddc061b696ff737f3fb)
 
-commit ff886a66de637fce7f1669269e583434c419db95
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Fri Apr 4 10:46:45 2008 -0400
+commit aa6d12e93e8661da841192ef7c3aa7c6a7731c7f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 2 17:46:59 2008 -0700
 
-    Convert __DRIconfigs after we've made sure createNewScreen succeeded.
-    (cherry picked from commit ec17900f52bbd25d07566834756e5c7e832e0463)
+    turns out we weren't actually using these files. oops
+    (cherry picked from commit bfec44d7b4baf0ad0aae55c8209bc60ac93c5b58)
 
-commit d1dd7749106798b172a61ff2e4fd818d5b207f51
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Thu Apr 3 16:44:32 2008 -0400
+commit 6c5962e44730395f81cdb333322c9ad5242c32d4
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 18:15:18 2008 -0700
 
-    Only autoload RECORD if it was enabled.
-    (cherry picked from commit 16a8ce75585ea360c39e0ffce4f7bb26a359b754)
+    remove vestigal DarwinEQPointerPost etc
+    (cherry picked from commit a25704c423598d596fd7f2ed4290d4b860bd5d5f)
+
+commit c6f0d5d1e51326e5110d27918d834eb0096df7db
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 17:48:09 2008 -0700
+
+    gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
+    (cherry picked from commit a9e081a60ca227c0d96d4613075d97d6b762366a)
+
+commit 5b6c273eaa53d7b554d69c2b4865988068e73a26
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 17:08:45 2008 -0700
+
+    add prototype for DarwinEventHandler
+    (cherry picked from commit 9a03ae33c4f9de830f15eabf3b994882ead7c000)
 
-commit 81af92f5d912869f928967b1b45f8ac0b6bee8d0
+commit 3713be8b470b1ac0fcb4f1e4c6b79c526b2196db
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 16:30:16 2008 -0700
+
+    add logging of current thread ID to DEBUG_LOG macro
+    (cherry picked from commit 5848510cc5a8091b30230ab920d904ca6b159480)
+
+commit 1400a51ae70d8e498d9ae3975f58ba7c1768ca6f
+Author: Ben Byer <bbyer@apple.com>
+Date:   Mon Mar 31 16:24:01 2008 -0700
+
+    Begin to move all of our Xquartz DDX-specific event handlers
+    to miEQ, in preparation to remove the DDX-specific code entirely.
+    (cherry picked from commit 3f4447b95f73a82b3aa0f7b0d1640aba5fb0d1bc)
+
+commit 8746daa6732d9837f66d925f2fd74818ecbf8ba2
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Apr 2 15:01:33 2008 -0700
+
+    XQuartz: Fixed missing close-paren in preference pane text.
+    (cherry picked from commit ea37e151dc6032d2a1a33cef809f2a7d507aae35)
+
+commit b5a0a865c3045cc08c33388320d4ec3ab7065efb
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Wed Apr 2 19:21:41 2008 -0400
 
     Pick up dri2proto from the standard proto header include path.
 
-commit 856d9dd61548f3b45c5ea64bbde51c8f96307c38
+commit 8cde0af3c57f0375ba8ba77af9fdf74b79d9496d
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Wed Apr 2 19:06:40 2008 -0400
 
     Send the GLX_EXT_texture_from_pixmap attributes to the client.
 
-commit bbd87f85a30916e19155f3e76ad8d8d5a8a5d867
+commit 7c20f65fea3dd3170cde89d7113d85f377671bfb
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Wed Apr 2 18:00:06 2008 -0400
 
@@ -2507,32 +15413,36 @@ Date:   Wed Apr 2 18:00:06 2008 -0400
     
     Pointed out by Hasso Tepper.
 
-commit 24781227930626b26695d4db603dc1bf621e4cd1
+commit b13ab156894074fb38cc812738bc7aeeebd9614d
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Wed Apr 2 12:38:36 2008 -0400
 
     dri2: Unbreak glcore visual setup.
 
-commit 7d97c19c2d530c8db16b01de9b168dd910059b4e
+commit b31de6a59044f91f8230aa581c9ca8540289c168
 Author: Xiang, Haihao <haihao.xiang@intel.com>
 Date:   Wed Apr 2 16:29:30 2008 +1000
 
     dri2: fix crasher if DRI2Connect fails
 
-commit 2156bdf3b7b5b7d3ee4d3278eac0f28c7bff830a
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Wed Mar 26 19:28:09 2008 -0400
+commit ebc56aca8bdfec1918cac3c8380895dfddea48ce
+Author: Hong Liu <hong.liu@intel.com>
+Date:   Wed Apr 2 10:43:19 2008 +0800
 
-    Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
+    Bug #15160: quirk Proview AY765C
     
-    Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
-    __GLXcontext.  Drop all #includes of glcontextmodes.h and glcore.h.
-    Drop the DRI context modes extension.
+    prefer first detailed timing
+
+commit 9500033b9ecdfaf5a56a4355ffc94d74cb17ca17
+Author: Goneri Le Bouder <goneri@rulezlan.org>
+Date:   Tue Apr 1 20:19:40 2008 +0200
+
+    xfree86: don't crash in AutoConfig if the primary device is not pci
     
-    Add protocol code to DRI2 module and load DRI2 extension by default.
-    (cherry picked from commit c40e0b51f0d9ef5e1f30f233d7db1e6db9d6681b)
+    Only call matchDriverFromFiles() if we found a pci device.
+    Debian bug#472823 (http://bugs.debian.org/472823).
 
-commit a45586da2b2377e6fd80704b3ab454ab868f20eb
+commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96
 Author: Thomas Jaeger <thjaeger@gmail.com>
 Date:   Tue Apr 1 15:27:06 2008 +0300
 
@@ -2545,16 +15455,134 @@ Date:   Tue Apr 1 15:27:06 2008 +0300
     This supersedes the previous workaround in 50e80c9.
     
     Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96)
 
-commit bde2890148683118eaec4140c206c5f90fb44fa0
+commit a4d034941100c6ca3b7cc4e59952c2745b9306cc
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Fri Mar 28 20:47:44 2008 -0700
+
+    Add code to track 5 valuators for pointing device, in preparation
+    for supporting tablet input in Xquartz.
+    (cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
+
+commit 6648867d8bd1e86458d2ade77a3ee4567c3d6a97
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Fri Mar 28 18:27:02 2008 -0700
+
+    add debug statements so we can see if/when our Xinput stubs are getting called.
+    (cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
+
+commit 19ff23ab0e72a27d05ed4470f75a0934d6f6c1d1
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Fri Mar 28 18:25:03 2008 -0700
+
+    Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
+    InitValuatorDeviceClass.
+    Add InitProximityClassDeviceStruct call to prepare for tablet support.
+    (cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
+
+commit 9f56fc580646a519875b5a1452738d8c6e1fa860
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Mar 31 17:34:07 2008 -0400
 
     XSELinux: Add a request to get a client's context from a resource ID.
-    (cherry picked from commit 9f56fc580646a519875b5a1452738d8c6e1fa860)
 
-commit c26bccf4173a037aa403c511dd08fd63cbbed87a
+commit c40e0b51f0d9ef5e1f30f233d7db1e6db9d6681b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed Mar 26 19:28:09 2008 -0400
+
+    Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
+    
+    Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
+    __GLXcontext.  Drop all #includes of glcontextmodes.h and glcore.h.
+    Drop the DRI context modes extension.
+    
+    Add protocol code to DRI2 module and load DRI2 extension by default.
+
+commit 8074676d2df8d577b443e3fa5e22d7c71c944bd1
+Author: Fredrik Höglund <fredrik@kde.org>
+Date:   Mon Mar 31 21:24:59 2008 +0200
+
+    EXA: Optimize the eviction scanning loop in exaOffscreenAlloc.
+    
+    Reduce the cost of the inner loop, by keeping a set of pointers to the
+    first and the last areas in the series, subtracting the cost of the first
+    area from the score, and adding the cost of the last area while walking
+    the list.  This commit also moves the scanning loop from exaOffscreenAlloc
+    into a separate function.
+    
+    Idea by Michel Dänzer.
+
+commit 93d876891dbba41b920a9a29a5de77f647f43928
+Author: Fredrik Höglund <fredrik@kde.org>
+Date:   Mon Mar 31 21:15:50 2008 +0200
+
+    EXA: Improve the algorithm used for tracking offscreen pixmap use.
+    
+    Replace the current score keeping algorithm with a rolling counter that's
+    incremented in ExaOffscreenMarkUsed, with the previous value being stored
+    in the area.  exaOffscreenAlloc uses the difference between the counter
+    value and the value in the area when deciding which area to evict.
+    It now also takes the size of the areas into account, and favors evicting
+    smaller areas.
+    
+    The credit for these ideas goes to Michel Dänzer.
+
+commit 7034484f0887ea0f8ab956515f2d9301ea5842ce
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Mar 28 10:23:36 2008 +0200
+
+    gitignore: Add two more bits
+    
+    Get slightly better at ignoring vim swap files, and let people keep
+    local changes if they want to.
+
+commit b8ea9f2a25aad88aee77a68f8e20ac07276f0dab
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Mar 28 17:00:08 2008 -0700
+
+    XQuartz: Fixed names of enums to be more consistent
+    (cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
+
+commit bd28839eb866a9e6dc3ff80f13a67611da7eaf64
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Mar 28 17:02:02 2008 -0700
+
+    =?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
+    
+    =20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=utf-8
+    Content-Transfer-Encoding: 8bit
+
+commit 933ffcdf7d2eaaf7caabfe6f861f04bcb149918f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Mar 28 17:53:55 2008 -0400
+
+    Compile fix.
+
+commit 9e8451d869a4032ddb7de6a62920a3a7b0b1acc1
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 3 17:38:53 2007 -0500
+
+    Add E-EDID segment selection.
+
+commit 0b4aef4d6df7a5525d381de035fbbf78c5fffeef
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 3 16:00:00 2007 -0500
+
+    Refactor DDC2 code to allow for proper segmented addressing.
+
+commit 88ece11d6c45c6f4b94f7fb2da64a46e879d7c27
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Dec 3 15:47:39 2007 -0500
+
+    Start E-EDID support in the DDC module.
+    
+    Since there's no way to safely know how many blocks xf86DoEDID_DDC2 would
+    return, add a new xf86DoEEDID entrypoint to do that, and implement the
+    one in terms of the other.
+
+commit b5f98fcea2024c67e598947782913982072cf4fb
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Mar 28 14:01:34 2008 -0400
 
@@ -2563,53 +15591,98 @@ Date:   Fri Mar 28 14:01:34 2008 -0400
     
     The option goes in the "extmod" subsection.
     TODO: Make it easier for extension modules to handle their own options.
-    (cherry picked from commit b5f98fcea2024c67e598947782913982072cf4fb)
 
-commit ae8edf3ee78ec1786c71b60ac0a5c9a2efb4e857
+commit 415e49b940bba2d08870db410ebb47d2add5d836
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Mar 25 23:01:02 2008 -0700
+
+    XQuartz: Sanity-check the removal of the 256-color option
+    Fixes the 'one-time-preferences' bug in 2.2.0_rc1
+    (cherry picked from commit 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d)
+
+commit c1d37efe9aae5f2895b3437418f7e4bb2eb3400f
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Tue Mar 25 19:25:00 2008 -0700
+
+    xquartz: copy in new stubs from Xi/stubs.c to replace our old
+    Xinput stubs.  Hey, it's a start.
+    (cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
+
+commit c4a616a741e15865ce0ff98781c6f1dca4d62887
+Author: Ben Byer <bbyer@bushing.apple.com>
+Date:   Mon Mar 24 22:43:10 2008 -0700
+
+    prevent "fake mouse clicks" from generating spurious extra events
+    (cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
+
+commit c747030a49dd289e873e2b686cd129d840e55468
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Mar 27 15:18:39 2008 +1000
+
+    quirk: fix LPL monitors properly.
+    
+    no point having a h cm fix when we really want to copy the sizes from the
+    other place.
+    
+    RH BZ 435216
+
+commit 9df915b84d45d39aed7557c98883b20a66da2e96
+Merge: 47eb658 333e712
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Tue Mar 25 17:50:50 2008 +0100
+
+    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
+
+commit 333e7123dc484888d79c0f5aa3977bd72f1eb341
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Mar 25 12:48:22 2008 -0400
 
     Fix that last commit.
     
     I can apply patches, really.
-    (cherry picked from commit 333e7123dc484888d79c0f5aa3977bd72f1eb341)
 
-commit ff99a3aa2b6f3918c7692f360a3df30cf5a541ec
+commit 47eb658e802775021e3efec109f95431cca188ca
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Tue Mar 25 17:37:25 2008 +0100
+
+    Support to pass arbitrary options via HAL hotplugging
+    
+    Parse "input.x11_options" and pass every key/name pair to the driver.
+    Remove check for input.capabilities, because that's part of the fdi files.
+    
+    Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch.
+
+commit e7a364425547103a98acabfc67d16e1ae0c2967f
 Author: Sascha Hlusiak <saschahlusiak@arcor.de>
 Date:   Tue Mar 25 12:32:33 2008 -0400
 
     Fix getValuatorEvents to compute number of valuators correctly.
-    (cherry picked from commit e7a364425547103a98acabfc67d16e1ae0c2967f)
 
-commit 2d312eaf4f5f9cb1d8f08691125a0d91243932fa
+commit f028e245a7932362656701c08fcfbfa8e8949077
 Author: David Nusinow <dnusinow@debian.org>
 Date:   Thu Feb 28 19:45:21 2008 -0500
 
     Bug #10016: Implement WM_CLASS hints in Xephyr.
-    (cherry picked from commit f028e245a7932362656701c08fcfbfa8e8949077)
 
-commit d6ec5eaded2a645f132f84162b5ab0a9f513e38e
+commit 862ff9ac92037e13629329eb6ba50ff6bd2c5f71
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Mar 24 13:37:42 2008 -0400
 
     Bug #11510: Fix build without RECORD.
-    (cherry picked from commit 862ff9ac92037e13629329eb6ba50ff6bd2c5f71)
 
-commit f250352d2e6676af11d734c109f8edb0231f5164
+commit 87bfd3bd96c714a1c252d42408b5a1a4ff9dab06
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Mar 24 13:33:38 2008 -0400
 
     Bug #11508: Fix build without XV.
-    (cherry picked from commit 87bfd3bd96c714a1c252d42408b5a1a4ff9dab06)
 
-commit fdf927c2cdd1b92f0774f977d3195532294715d7
+commit 536f2ff5382aaaace3b55481e15366bb15d87801
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Mar 24 12:22:19 2008 -0400
 
     Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
-    (cherry picked from commit 536f2ff5382aaaace3b55481e15366bb15d87801)
 
-commit 80968c4a91e16533cfc42c88a3e40af4a84112c5
+commit 4217ba0cf0c9bbea3774760e836ab372acf3237c
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Sat Mar 22 17:31:08 2008 +0100
 
@@ -2617,9 +15690,8 @@ Date:   Sat Mar 22 17:31:08 2008 +0100
     
     The latter doesn't return the option's value, just whether it's present
     in the configuration.
-    (cherry picked from commit 4217ba0cf0c9bbea3774760e836ab372acf3237c)
 
-commit f40bd686e502c4b73b65dcfbc7321704dd663052
+commit 6b9d2bb1f7f87acbf275027af9c2982e91e5faed
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Sat Mar 22 17:28:48 2008 +0100
 
@@ -2628,9 +15700,60 @@ Date:   Sat Mar 22 17:28:48 2008 +0100
     The latter doesn't give you the option's value, it just tells you if
     it's present in the configuration.  So using Option "EXANoComposite" "false"
     disabled composite acceleration.
-    (cherry picked from commit 6b9d2bb1f7f87acbf275027af9c2982e91e5faed)
 
-commit 84a27f7a92b60c345b4f055e41e239d8ebbccc60
+commit 63859473965f911515bc6e8d87b32a65ec41eb73
+Author: Jeremy Huddleston <jeremy@tifa.local>
+Date:   Fri Mar 21 19:31:31 2008 -0700
+
+    XQuartz: Disable 256 color option and fullscreen option
+    (cherry picked from commit 7c1964338a33558d3f25e369dfca99e3ef9d10f9)
+
+commit 93daa3a3bf1a981757024847882ce92b6bdaae83
+Author: Jeremy Huddleston <jeremy@tifa.local>
+Date:   Fri Mar 21 19:11:59 2008 -0700
+
+    Xquartz: Added separate preference tab for quartz-wm settings
+    Added FFM and "Focus on new window" options
+    (cherry picked from commit 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
+
+commit c49e11268322712c211f29d51d664d3f8a59b00b
+Author: Jeremy Huddleston <jeremy@tifa.local>
+Date:   Fri Mar 21 18:07:38 2008 -0700
+
+    XQuartz: Initial framework for dealing with spaces on OS-X
+    (cherry picked from commit 9831324998f9d1f05ff944c58c5bf60dcae17355)
+
+commit 4c76607b699431183ee7e88fa7818cb7644a5a02
+Author: Jeremy Huddleston <jeremy@tifa.local>
+Date:   Mon Mar 17 23:57:41 2008 -0700
+
+    Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
+    (cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
+
+commit 87c64cfd6901083da5a9375d0bde65691d374b5b
+Author: Jeremy Huddleston <jeremy@tifa.local>
+Date:   Fri Mar 14 17:31:54 2008 -0700
+
+    =?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
+    
+    =20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=utf-8
+    Content-Transfer-Encoding: 8bit
+
+commit 3bbd77ff98478153afe3251de9ba11d757218213
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Mar 20 20:03:02 2008 -0400
+
+    XSELinux: Do a check for whether background "None" is allowed.
+
+commit e323bb426ce8a072d119cb2720b773241259c137
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Mar 20 19:42:09 2008 -0400
+
+    XSELinux: Correctly handle some permission bits that are used more than once.
+
+commit da973e962d09854b571320dee7dd9569060bc39e
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Thu Mar 20 09:18:29 2008 -0400
 
@@ -2640,9 +15763,26 @@ Date:   Thu Mar 20 09:18:29 2008 -0400
     platforms) fixes it for me with the radeon driver and doesn't break intel.
     
     Correct patch this time :)
-    (cherry picked from commit da973e962d09854b571320dee7dd9569060bc39e)
 
-commit a65e9722c4aaba098dcf49dbcd13a13e0cadbda8
+commit f8c1eb29e28818895d744c4e1d6897353d51790b
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 20 09:14:41 2008 -0400
+
+    Revert "Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB"
+    
+    This reverts commit 267352579612155adfd4743432d6569b2cdeebde.
+    
+    Pushed the wrong patch.
+
+commit 267352579612155adfd4743432d6569b2cdeebde
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date:   Wed Mar 19 19:12:37 2008 -0400
+
+    Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
+    
+    See bug 11796
+
+commit 060a99444ee25a684b0ab9b4819bf8e855aea2d8
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Mar 19 16:04:16 2008 -0700
 
@@ -2650,23 +15790,51 @@ Date:   Wed Mar 19 16:04:16 2008 -0700
     
     Makes it easier to figure out what you're seeing in the stack trace
     instead of wondering where in the server "ProcSend" is.
-    (cherry picked from commit 060a99444ee25a684b0ab9b4819bf8e855aea2d8)
 
-commit 0aa3b971b4b0cc7b22e4e916ca77c6b673b6bb51
+commit f37046984d7839faefa4d716624e4a85ddde9634
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Mar 19 14:06:53 2008 -0700
 
     Xevie cleanups, byteswapping fixes & request length check fixes
-    (cherry picked from commit f37046984d7839faefa4d716624e4a85ddde9634)
 
-commit 21dc18624544c87c711b3aba63d96cbbf4637505
+commit edad0a9dfebcce5c54b2f9c32bd9d45549e20c51
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Mar 18 17:51:21 2008 -0400
+
+    Apply __glXDisp_GetVisualConfigs message patch
+    From http://bugs.freedesktop.org/show_bug.cgi?id=13863
+    
+    Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
+    function left garbage in the tail end of the message used for extensions.
+
+commit cdadd2ff9bade318caac5c1d9bcdc8a001347da9
 Author: Dodji Seketeli <dodji@seketeli.org>
 Date:   Tue Mar 18 14:00:15 2008 +0100
 
     [Xephyr/DRI] correctly route motion events targeted at GL drawable
-    (cherry picked from commit cdadd2ff9bade318caac5c1d9bcdc8a001347da9)
 
-commit 4f0755d6d41055be091d3dea477697a2617e1505
+commit afd7428690d87097117ab20335658f6d59d60103
+Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
+Date:   Mon Mar 17 14:55:44 2008 -0700
+
+    Cleanup logic in xf86PrepareOutputs
+    
+    Should have done this in the first place.  Since we're checking for the absence
+    of the get_crtc callback in the first place, we'll short circuit the later call
+    and disable the output, so the ugly "continue" block is unnecesary.
+
+commit ba85caacb565b9aa0aeace52a362350304b0566d
+Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
+Date:   Mon Mar 17 14:13:09 2008 -0700
+
+    Make xf86SetDesiredModes aware of current output configuration
+    
+    By adding a new output callback, ->get_crtc, xf86SetDesiredModes is able to
+    avoid turning off outputs & CRTCs if the current output<->CRTC mappings are the
+    same as the desired configuration.  This helps avoid flickering displays at
+    startup time, which speeds things up a little and looks better.
+
+commit bee2ddf35f75086cee951142098637f2c756b96b
 Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
 Date:   Mon Mar 17 08:33:01 2008 -0700
 
@@ -2678,9 +15846,8 @@ Date:   Mon Mar 17 08:33:01 2008 -0700
     we didn't do anything.
     
     Fixes #14444.
-    (cherry picked from commit bee2ddf35f75086cee951142098637f2c756b96b)
 
-commit 727e22c8305a42987841e96b190a23a56259cd8f
+commit db248ffb840a0c113b6eb508a0fa1e74e752474d
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Sun Mar 16 18:46:11 2008 +0100
 
@@ -2688,23 +15855,20 @@ Date:   Sun Mar 16 18:46:11 2008 +0100
     
     This avoids creating a dependency on -current libpciaccess for
     BSD systems other than OpenBSD (which don't otherwise need it).
-    (cherry picked from commit db248ffb840a0c113b6eb508a0fa1e74e752474d)
 
-commit a399b77e8f1034c3b92c5b7eb3445d1e5b64a8e9
+commit aa231f28d56402d7daea6cbd3002fbf760f79497
 Author: Donnie Berkholz <dberkholz@gentoo.org>
 Date:   Fri Mar 14 18:41:25 2008 -0700
 
     Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
-    (cherry picked from commit aa231f28d56402d7daea6cbd3002fbf760f79497)
 
-commit c81a8c3eac7864febbef9782a35020b61daa1352
+commit a955c3b587b22b8bf20cb6bedbbec4ad5fcb32ac
 Author: Donnie Berkholz <dberkholz@gentoo.org>
 Date:   Fri Mar 14 18:41:07 2008 -0700
 
     Xephyr: Distribute ephyrdriext.h in tarballs.
-    (cherry picked from commit a955c3b587b22b8bf20cb6bedbbec4ad5fcb32ac)
 
-commit 6b75b44d9e19c5b94985728d30c1307ba1ba8b8c
+commit 090b26db767d296e7a3452da83b136d1caa0ed01
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Mar 14 21:58:27 2008 +0200
 
@@ -2718,41 +15882,24 @@ Date:   Fri Mar 14 21:58:27 2008 +0200
     A polite, non-astute, observer will then fix it.
     
     C'est la vie.
-    (cherry picked from commit 090b26db767d296e7a3452da83b136d1caa0ed01)
-
-commit 98249dfa98b53a238b7d881beb5ec8b85f28ecd0
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Thu Mar 20 20:03:02 2008 -0400
-
-    XSELinux: Do a check for whether background "None" is allowed.
-    (cherry picked from commit 3bbd77ff98478153afe3251de9ba11d757218213)
-
-commit d08bb7040cd5ba2d438dec614ff1b4dd0f9b33d5
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Thu Mar 20 19:42:09 2008 -0400
-
-    XSELinux: Correctly handle some permission bits that are used more than once.
-    (cherry picked from commit e323bb426ce8a072d119cb2720b773241259c137)
 
-commit c6ac4d4f4dfe3d792c77c48b009abc6e7103fbad
-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
-Date:   Tue Mar 18 17:51:21 2008 -0400
+commit 88bec0915e3867f8dbf859a3dfbb771d0d07092d
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Mar 14 21:54:13 2008 +0200
 
-    Apply __glXDisp_GetVisualConfigs message patch
-    From http://bugs.freedesktop.org/show_bug.cgi?id=13863
+    mi: More meaningful assert crashes
     
-    Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
-    function left garbage in the tail end of the message used for extensions.
-    (cherry picked from commit edad0a9dfebcce5c54b2f9c32bd9d45549e20c51)
+    When we fail an assert in miregion.c (which happens every now and then,
+    though I haven't yet checked up why), at least generate a segfault, so
+    we'll get a backtrace.
 
-commit 4a61cf3b08942895868e18bff11e0e4e12f69a7e
+commit 57d48d94b8947c571925e6fd4c9bf041fbd1b2ac
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Mar 14 14:37:42 2008 -0400
 
     Fix a stray use of ALLOCATE_LOCAL.
-    (cherry picked from commit 57d48d94b8947c571925e6fd4c9bf041fbd1b2ac)
 
-commit 43739b9a32cbe45139935bbeb39aecf7b7dd017c
+commit 824853772241acf64bc37ac8b85254194741ae13
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Mar 14 14:24:21 2008 -0400
 
@@ -2761,9 +15908,8 @@ Date:   Fri Mar 14 14:24:21 2008 -0400
     Actually more like in the mainline case, where the ideal mode happens to
     be the very first aspect match on the first monitor.  But let's not
     split hairs.
-    (cherry picked from commit 824853772241acf64bc37ac8b85254194741ae13)
 
-commit 92cffb8cc2bf0e6ac79a00477d7d63950d584cd3
+commit 1b9878ffcfc0c0dbc4a6e674827fe508ba77db4b
 Author: Bart Trojanowski <bart@jukie.net>
 Date:   Thu Mar 13 17:42:16 2008 -0400
 
@@ -2775,13 +15921,13 @@ Date:   Thu Mar 13 17:42:16 2008 -0400
     integrated graphics platforms that have explicit knowledge about the
     system's host bridge, for example.
 
-commit db26f32d0d0e2d6d11129ddfe46931308e536206
+commit f7abe05b3306ed9a6f2cf5e3e45ed524d725d029
 Author: Doug Chapman <doug.chapman@hp.com>
 Date:   Thu Mar 13 17:40:34 2008 -0400
 
     Bug #14091: Fix build (and runtime) on ia64.
 
-commit 95f6d8822da22518c6e1fb3988f12edd7267d7f8
+commit 5d7437c29e686a081b20823450d78c4c2f4e0aec
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Thu Mar 13 17:37:12 2008 -0400
 
@@ -2791,7 +15937,7 @@ Date:   Thu Mar 13 17:37:12 2008 -0400
     the RANDR 1.1 notion wouldn't, so your screen would appear to be square
     and probably at some ludicrous DPI.
 
-commit e4dee1626dd97632a6df053f10ef732de341a2f6
+commit 61c3f63a75d8b0cc47ffed4a0e30147fab2ae8f4
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Thu Mar 13 17:34:54 2008 -0400
 
@@ -2801,7 +15947,7 @@ Date:   Thu Mar 13 17:34:54 2008 -0400
     proably others) get very confused by it.  So do the drivers, for that
     matter.
 
-commit ce70eb1fe333c1a0d4bb259532f547884daa8f26
+commit 06c0372c3a1b45005eb6d50406f77f4e93f1de1e
 Author: Mark Kettenis <mark.kettenis@xs4all.nl>
 Date:   Wed Mar 12 21:45:37 2008 +0100
 
@@ -2813,7 +15959,40 @@ Date:   Wed Mar 12 21:45:37 2008 +0100
     os-support code.  Since pci_system_init_dev_mem() is a no-op on
     FreeBSD this should be no problem.
 
-commit b02d11e629cceb8f14e1c8854a2a02411ff071c0
+commit 2036851125226065891f13583ade3ce559e7bd37
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Mon Mar 10 19:29:07 2008 +0100
+
+    Return randr interface version in xf86CrtcScreenInit()
+    
+    Necessary to allow drivers to be run-time backwards compatible when using the
+    modes/ functions w/o providing their own copy.
+
+commit c7536f4b87e089a7e7c43026b189922fec70c565
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Tue Mar 11 13:11:04 2008 -0400
+
+    Silence REGION_INIT() warning.
+    
+    Evaluating the address of a BoxRec as a boolean gives this warning:
+    
+      i830_driver.c:2317: warning: the address of 'ScreenBox' will always
+      evaluate as 'true'
+    
+    which is pretty annoying.  This patch compares the address to NULL to
+    avoid the pointer->bool conversion and gets rid of the warning.  Seems
+    like a lame hack, but the warning is worse.
+
+commit cc05255191413b3f376edbc600122ff085f45f7b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Tue Mar 11 00:51:43 2008 -0400
+
+    Make WriteToClient take a const void * like any decent IO write function.
+    
+    Enough with the casting.  Doesn't break API or even ABI, but does make
+    a lot of silly casts superfluos.
+
+commit bc504ffbba3dec2e3467bab8ba1ac25db6dd317e
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Tue Mar 11 00:35:31 2008 -0400
 
@@ -2822,31 +16001,47 @@ Date:   Tue Mar 11 00:35:31 2008 -0400
     DRI2 uses the same authentication scheme as XF86DRI, so implement this
     entry point so DRI2 protocol code can access it.
 
-commit 54c31572d53ffc1844cba3fa2f748717665381f0
+commit b2657ec5981122e7cc0bda0d8802aec63cde9014
 Author: Keith Packard <keithp@keithp.com>
 Date:   Wed Feb 6 16:51:57 2008 -0800
 
     XkbCopyKeymap was mangling doodads and overlays
 
-commit 02feb14a678e3b8ad9acf0b6db8d159b4fd64147
+commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Mar 10 13:40:00 2008 -0400
+
+    Add the "amd" driver to magic driver selection.
+
+commit 0f6aaf636b7ac4c98467284ff7baf1b83e0b72e7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Mon Mar 10 09:14:20 2008 -0400
+
+    Bug #14927: Fix the math for xf86NumDefaultModes.
+
+commit 01c2e01f2aee580438b74bfb9da8f584f3878e6b
 Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
 Date:   Sun Mar 9 21:40:27 2008 -0400
 
     GLX: Track changes to DRI_TEX_BUFFER extension.
     
     We now just pass in the __DRIdrawable.
-    (cherry picked from commit 01c2e01f2aee580438b74bfb9da8f584f3878e6b)
 
-commit 12829f1e9158445dd66d32885ff9e3f902bf8c0e
+commit acedc03367e9e69f03b4838f0f0e8d8a8e872b9b
 Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
 Date:   Sun Mar 9 21:39:19 2008 -0400
 
     DRI2: Return event buffer head index in DRI2CreateDrawable.
     
     And pass it to the DRI driver in AIGLX.
-    (cherry picked from commit acedc03367e9e69f03b4838f0f0e8d8a8e872b9b)
 
-commit 4aaf048b5a00ee4f91c2a1d026cd313f0207f0bc
+commit 911f0c147699d3b8d97491be2ef6d2e4a6682a0b
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Mar 7 23:24:06 2008 +0100
+
+    Programs in hw/dmx/examples/ want client-side xkb headers.
+
+commit 9abaad115cb6245b12b2adb3552ace99b634ab4a
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Fri Mar 7 14:12:28 2008 -0500
 
@@ -2854,22 +16049,8 @@ Date:   Fri Mar 7 14:12:28 2008 -0500
     
     Thanks to Dennis Kasprzyk for pointing it out and for reminding me to
     commit it.
-    (cherry picked from commit 9abaad115cb6245b12b2adb3552ace99b634ab4a)
 
-commit 921cbc58036491eab491b4c7b07111f04aa58d40
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Mar 10 13:40:00 2008 -0400
-
-    Add the "amd" driver to magic driver selection.
-
-commit e5bd75e11f1ac6b01d408166e628e9bbdb218b71
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Mar 10 09:14:20 2008 -0400
-
-    Bug #14927: Fix the math for xf86NumDefaultModes.
-    (cherry picked from commit 0f6aaf636b7ac4c98467284ff7baf1b83e0b72e7)
-
-commit ef702d586697c4ae9092ab0a412719c11973ec60
+commit 3bf7ff70323d533a3a05c0f3e22393e63beada99
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Mar 7 09:25:06 2008 -0500
 
@@ -2879,36 +16060,69 @@ Date:   Fri Mar 7 09:25:06 2008 -0500
     won't work now.  Fix the consumers of xf86DefaultModes to use the new
     explicit size as well.
 
-commit b260febcec2e483c094d5c31ed9910a36a65cc53
+commit 3fcb6445dc08f42488287162e3b7009d405e9c5b
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Fri Mar 7 08:29:49 2008 -0500
 
     Fix segfault when a monitor exists but has no modes.
     
     Thanks to Zhenyu Wang for finding this.
-    (cherry picked from commit 3fcb6445dc08f42488287162e3b7009d405e9c5b)
 
-commit 375908557fd11e37e8d686f1ff6a372aa2c239de
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Thu Mar 6 00:19:09 2008 -0500
+commit a8d760f567b19268329c4682495caa591f08a854
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Sun Mar 2 20:13:11 2008 -0800
 
-    xserver 1.4.99.901
+    Get modes code building with old X servers again.
+    
+    This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2"
+    since XORG_VERSION current went backwards at some point.
 
-commit 2a47accff8dccded4dfe031f9366c028ba927824
+commit ca616b902b2c5d0f046c7a042c11f045479e373a
+Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
+Date:   Thu Mar 6 13:47:44 2008 -0800
+
+    Allow RandR get output property to call into drivers
+    
+    In order to report accurate values to users of the RandR property interface,
+    it's sometimes necessary to ask the driver to update the value (for example
+    when backlight brightness changes without the server's knowledge, due to hotkey
+    events or direct sysfs banging).
+    
+    This patch wires up the core server code with a new xf86CrtcFuncs callback,
+    get_property, to allow for this.
+    
+    The new code is available under the RANDR_13_INTERFACE define, which in turn
+    depends on the RANDR_12_INTERFACE code.
+
+commit 34b69e3bc0e6462eb60029fbcb4f5479494007a2
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Mar 5 23:56:49 2008 -0500
 
     Fix distcheck.
+    (cherry picked from commit 2a47accff8dccded4dfe031f9366c028ba927824)
+
+commit 8e562fe26ff77c03be0855afb08e43f3ed0bd4b9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Mar 5 15:11:41 2008 +1030
+
+    Xi: remove false memset from DeepCopyDeviceClasses.
+    
+    It's wrong, needs to be different, but I haven't had enough coffee to figure
+    out what it needs to do yet.
 
-commit 9de621afee4c9ad0d58d71968ec2c32a7fcc7753
+commit d4101140f4e569f18554cf0cbf43138d08bd1277
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Mar 4 22:39:41 2008 -0500
 
     xselinux: Implement polyinstantiation support and related protocol.
-    
-    (cherry picked from commit d4101140f4e569f18554cf0cbf43138d08bd1277)
 
-commit e4d92a13e83b4327067c97d8c9fe151a1c0b35af
+commit cf984dcc156958d4f8d98110e7add150628ce97e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Mar 4 16:03:04 2008 -0800
+
+    Make sure SIOGLIFCONF buffer is properly aligned for socket structures
+
+commit 27e7dacbf7ef17712be31ff90f98ee3a5c5cf909
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Mar 4 11:38:34 2008 -0500
 
@@ -2932,32 +16146,69 @@ Date:   Tue Mar 4 11:38:34 2008 -0500
     end up with displays that simply don't have modes in common.  We need to
     switch to right-of placement someday, once we're not limited to CRTC size
     limits and we have working multi-GPU in RANDR.
-    (cherry picked from commit 27e7dacbf7ef17712be31ff90f98ee3a5c5cf909)
 
-commit 5afdba241e59b1dbcec962fea809f445739590f3
+commit 95df04b744c6a3498a9a9e2ea9bb03ee780e60f8
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Mar 4 10:59:24 2008 -0500
 
     Remove all mention of the vga driver from the config logic.
-    (cherry picked from commit 95df04b744c6a3498a9a9e2ea9bb03ee780e60f8)
 
-commit 926f32df3c8b9c9e1822d54918a4d833ee21c344
+commit 7b4f3616f75a541b819d99c28bb6cb73761b6066
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Mar 4 18:29:15 2008 +1030
+
+    Xi: add deviceid to QueryDevicePointer request.
+    
+    Why not, we had the padding anyway.
+    Suggested by Jim Gettys on the X.Org mailing list.
+
+commit 056a2ce02ce85013e89055ee44a7aa3eabedac09
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Mar 4 02:44:48 2008 -0500
 
     XACE: Check the return value of the selection create hook call.
-    (cherry picked from commit 056a2ce02ce85013e89055ee44a7aa3eabedac09)
 
-commit 7f74ba1b774e56c4c9a29ce5aa7a2f6b8f395e33
+commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd
+Merge: 23ae68a 453661a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Mar 4 18:11:10 2008 +1030
+
+    Merge branch 'master' into mpx
+    
+    This merge reverts Magnus' device coorindate scaling changes. MPX core event
+    generation is very different, so we can't scale in GetPointerEvents.
+    
+    Conflicts:
+    
+    	Xi/opendev.c
+    	dix/devices.c
+    	dix/dixfonts.c
+    	dix/getevents.c
+    	dix/resource.c
+    	dix/window.c
+    	hw/xfree86/common/xf86Xinput.c
+    	mi/mipointer.c
+    	xkb/ddxBeep.c
+    	xkb/ddxCtrls.c
+    	xkb/ddxKeyClick.c
+    	xkb/ddxList.c
+    	xkb/ddxLoad.c
+    	xkb/xkb.c
+    	xkb/xkbAccessX.c
+    	xkb/xkbEvents.c
+    	xkb/xkbInit.c
+    	xkb/xkbPrKeyEv.c
+    	xkb/xkbUtils.c
+
+commit 72f2197545e734cd0aa785d05a57b2fc0351a763
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Mar 4 02:02:54 2008 -0500
 
     dix: Convert selection list to a linked list.
     
     Fixes a bug where pointers were being invalidated after a realloc.
-    (cherry picked from commit 72f2197545e734cd0aa785d05a57b2fc0351a763)
 
-commit 1bda57a41ea3bb3a624a5e75f421160ac98a0804
+commit 0bd0f90d7c7928052197da7119177e5a1c9eee2c
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Mar 4 03:47:36 2008 +0200
 
@@ -2967,9 +16218,20 @@ Date:   Tue Mar 4 03:47:36 2008 +0200
     setting the complete wrong keymap on startup (non-XKB map if we had an XKB
     map available, or the XKB map if we didn't have any available).  Invert the
     sense properly, and add two small bits that also went missing in that commit.
-    (cherry picked from commit 0bd0f90d7c7928052197da7119177e5a1c9eee2c)
 
-commit 5d2946655bb1c0da8559bb3f969b5037dcdc3918
+commit 613852ce6a821ce6f6382fc14629f517776a3701
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Mar 3 16:10:04 2008 -0500
+
+    Fix some documentation typos
+
+commit 3f23139137e024e09d207be05a61968100cf53e8
+Author: Jesse Barnes <jesse.barnes@intel.com>
+Date:   Mon Mar 3 13:05:12 2008 -0800
+
+    Add cscope files to .gitignore
+
+commit 708f07753ff22ade54e9ee8885e4198fff363b87
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Mar 3 15:49:48 2008 -0500
 
@@ -2979,7 +16241,7 @@ Date:   Mon Mar 3 15:49:48 2008 -0500
     be dutifully ignored and the driver will start at whatever resolution it
     feels like.
 
-commit 28c156e2ba15922604984670dab9081ac4e3ce12
+commit 605e6764dfd3e9cb917b9cfcd92fe89857c1a1c9
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Mar 3 15:45:17 2008 -0500
 
@@ -2987,7 +16249,7 @@ Date:   Mon Mar 3 15:45:17 2008 -0500
     
     See also Red Hat bug #229350, OpenSolaris bug #6366490.
 
-commit 71037ebfb426eb9657cbcd3de37ce28d5da34600
+commit 3b73d62791d925c465ec855f96981d151dd3c179
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Mar 3 15:43:22 2008 -0500
 
@@ -2996,11 +16258,11 @@ Date:   Mon Mar 3 15:43:22 2008 -0500
     We honor sync ranges and pixel clock settings from the config here, no
     reason to ignore DisplaySize.
 
-commit a9028a492f577798ddea3b5e0cc088baedfad09a
+commit 7c16b68ab879f5b4b1aedfc6b2aadbe56193dd19
 Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Mar 3 15:04:49 2008 -0500
+Date:   Mon Mar 3 15:09:11 2008 -0500
 
-    Branch for 1.5.
+    1.5 has branched, start 1.5.99.x.
 
 commit f7ab2d3821e6bccc943f088e308fd58395a186d2
 Author: David Nusinow <dnusinow@debian.org>
@@ -3356,6 +16618,29 @@ Date:   Tue Feb 26 12:13:06 2008 +0100
     
     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=14518 .
 
+commit 23ae68a4c74a2ec90b4130c37b0d0aec3f4082ce
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Feb 26 15:12:36 2008 +1030
+
+    dix: before copying the classes the first time, set the VCK's classes to NULL.
+    
+    XkbFinishDeviceInit does the following:
+      xkbi->kbdProc= pXDev->kbdfeed->CtrlProc;
+      pXDev->kbdfeed->CtrlProc= XkbDDXKeybdCtrlProc;
+    
+    If we directly copy the device classes for the VCK, pXDev->kbdfeed->CtrlProc
+    at the time of copying is still XbkDDXKeybdCtrlProc. So at some point
+    XkbDDXKeybdCtrlProc is called, and calls itself, and calls itself, and...
+    
+    Setting the device's classes to NULL seems to fix things. The memory isn't
+    lost, it gets stored into the devPrivates and freed at device closing time.
+
+commit ce9fb2f8c4610016e49321018fc9b24729380afc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Feb 26 13:19:54 2008 +1030
+
+    Xi: MDs return the paired device's ID in attached field of ListInputDevices.
+
 commit c46f7b62d2bf9f35937cfef98325ed904895396a
 Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
 Date:   Mon Feb 25 18:14:08 2008 -0300
@@ -3408,6 +16693,22 @@ Date:   Mon Feb 25 17:07:07 2008 -0300
         restorePciState() is not used for now (until we find why multiple
         cards aren't working).
 
+commit d61f481a4455dd2a94674d2b7b26429cf9dcece3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 25 17:52:45 2008 +1030
+
+    Xi: remove GetPairedPointer handling.
+    
+    obsolete, ListInputDevices provides this information now.
+
+commit 27b21278939a06ab6a22c9902f202eae6c5fae72
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 25 17:00:42 2008 +1030
+
+    Xi: remove ungrab handling of ExtendedUngrabDevice request.
+    
+    This can be done by UngrabDevice, no need for separate codepaths.
+
 commit 4b50e71bf127c8e0f289e3b76c786f0398effe65
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Sun Feb 24 20:25:13 2008 -0500
@@ -3528,6 +16829,14 @@ Date:   Wed Feb 20 10:36:06 2008 -0800
     Code shuffling in a634c9b03494ba80aeec28be19662ac96657cc23 broke this by
     leaving pSrcPixmap = NULL.
 
+commit f14a62f823e257f92745bbcde11838f2ddd32ac8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Feb 19 21:44:10 2008 +1030
+
+    dix: set evlen to the size of the reallocated memory.
+    
+    What a good idea this is... I'm very proud of myself.
+
 commit 67a78e84a81571cedaf7fd214a21ce1bbdc4fb3b
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Tue Feb 19 21:31:50 2008 +1030
@@ -3556,6 +16865,34 @@ Date:   Tue Feb 19 00:00:11 2008 -0800
     Also fix casting to silence warning.
     (cherry picked from commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)
 
+commit 750d70267679ddee10590c80ec621d890bd3d4a7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Feb 3 10:25:15 2008 +1030
+
+    dix: Ensure enough memory for ClassesChangedEvent for a new device.
+    
+    Before we enable the device through the driver, we size it up and make sure
+    that the events in the event list contain enough bytes for a possible
+    ClassesChangedEvent lateron.
+
+commit 74628d639719815c1beff4cac84662fa41c55925
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Feb 3 10:15:40 2008 +1030
+
+    dix: change GetEventList to return length of list and set parameter in place.
+    
+    Changing DDXs to use new prototype too.
+
+commit 77dba004a9aaf35f183f61ff6875a491a52aa030
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Feb 3 10:10:46 2008 +1030
+
+    dix: add InputEventListLen and SetMinimumEventSize
+    
+    The latter is used to increase the amount of allocated memory for the event
+    list. This will be needed for ClassesChangedEvents that can be of more or less
+    arbitrary size (larger than 32 anyway).
+
 commit 6cbaf15e6109ba77819c4070f5b46c78237ec460
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Tue Feb 19 12:02:22 2008 +1030
@@ -3567,6 +16904,24 @@ Date:   Tue Feb 19 12:02:22 2008 +1030
     
     Thanks to Bill Crawford for pointing it out.
 
+commit 3fe64d8d271aea0863bf01b0376f3eceec0c90b5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Feb 3 09:56:19 2008 +1030
+
+    Move input event list initialisation and storage from DDX to DIX.
+    
+    Rather than letting the DDX allocate the events, allocate them once in the DIX
+    and just pass it around when needed.
+    
+    DDX should call GetEventList() to obtain this list and then pass it into
+    Get{Pointer|Keyboard}Events.
+
+commit 09a8fc5c7a79ca22fc23224bb544f2e709681f3f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Feb 3 07:47:18 2008 +1030
+
+    Xi: make SizeDeviceInfo public and re-use from CreateClassesChangedEvent.
+
 commit 3abce3ea2b1f43bd111664d4a57e5ccd282acab0
 Author: Arjan van de Ven <arjan@infradead.org>
 Date:   Mon Feb 18 18:13:10 2008 +1030
@@ -3602,6 +16957,48 @@ Date:   Mon Feb 18 17:46:04 2008 +1030
     
     Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 
+commit 6d9d18bf7708eb9e640ef732b5dc4c99aa6d5feb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 18 17:25:15 2008 +1030
+
+    dix: add support for WindowAccessAllowAll in device access checking.
+    
+    AllowAll is the last check before the parent window is checked. This allows
+    to override a DenyAll in the parent window in a simpler way than before (the
+    previous method required all devices to be in the permit list).
+
+commit 088067c891a78670d9509f48f56bf3ff9c16a30d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 18 16:46:07 2008 +1030
+
+    Xi: even if ChangeDeviceHierarchy fails, we may need to send an event.
+    
+    Changes are committed instantly, so if at least one change was successful, we
+    must send an event to the client, even if subsequent ones fail.
+
+commit 660739c6bc84cb74f43a277052ce163fae654417
+Author: Benjamin Close <Benjamin.Close@clearchain.com>
+Date:   Fri Feb 15 13:36:34 2008 +1030
+
+    dix: Handle the case where a device cursor was removed correctly
+    
+    In the case that the device cursor was the first in the list of cursors
+    the window knew about, unsetting the cursor could lead to a segfault
+    due to pPrev being NULL. Instead catch the condition and correctly remove
+    the node from the list. Since there is no cursor now set on the device,
+    we simply return success as the parent windows cursor will propogate
+    down later.
+    
+    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit 24db28230120ecc2b65b25164b6e7b407970f9e2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 18 16:16:19 2008 +1030
+
+    dix: set num_events to 1 by default. (no RawDeviceEvents anymore)
+    
+    This should have been part of acb412d5399f865b5048fdd683147cea0f19f0c1.
+
 commit 45d00433e7bfbab476dd02ec92a9fbee40af5dad
 Author: Dan Nicholson <dbn.lists@gmail.com>
 Date:   Tue Jan 15 19:43:16 2008 -0800
@@ -3831,6 +17228,49 @@ Date:   Wed Feb 13 19:39:49 2008 -0500
     Opening a device is not really "reading" it.
     Requests that globally configure a device should require "manage" access.
 
+commit 921c298c4cdd2c879403ebdacbef48129058cad4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 14 09:48:19 2008 +1030
+
+    Xi: QueryDevicePointer doesn't have a shared field anymore.
+
+commit b885588756450e2fa25fdd191e300e1c5dd37ec3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 14 09:47:31 2008 +1030
+
+    Xi: remove FakeDeviceData calls. And one leftover from GrabAccessControl.
+    
+    FakeDeviceData needs more thoughtful integration.
+
+commit c99a9a97290c51bf2843f42d5683888cea8a3ff6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 14 09:43:49 2008 +1030
+
+    Xi: remove raw device events.
+    
+    Need to be better refined.
+
+commit b35a9efa16d9e14378a95c11fa39171b78710996
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 14 09:41:49 2008 +1030
+
+    Xi: Remove files for GrabAccessControl.
+
+commit b81c330f70c4a4c8f37216aa4856c7f8db93a375
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 14 09:32:54 2008 +1030
+
+    mi: remove RawDeviceEvent's ID changing.
+
+commit acb412d5399f865b5048fdd683147cea0f19f0c1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 14 09:27:51 2008 +1030
+
+    dix: Don't generate RawDeviceEvents anymore.
+    
+    These events have been removed from the protocol pending some more refinement
+    and more thoughtful integration.
+
 commit ba69904148acf755bec8fbda2eb869144f0ef7d4
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Sun Feb 3 22:49:23 2008 +1100
@@ -3987,6 +17427,16 @@ Date:   Sun Feb 10 16:34:40 2008 -0800
     XQuartz: Converted interface to nib 3.x format
     (cherry picked from commit 656aaab95773bd70fc3504b68bf7e1d292891d93)
 
+commit 0b0a09797302ac2171db5df20fc5110aafc8efbb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 7 15:48:04 2008 +1030
+
+    xkb: when copying the keymap, make sure the structs default to 0/NULL.
+    
+    It actually does help if a pointer is NULL rather than pointing to nirvana
+    when you're trying to free it lateron. Who would have thought?
+    (cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
+
 commit 7018f280406eb0ef899a4046de274cfdd582881b
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Feb 7 15:48:04 2008 +1030
@@ -4049,6 +17499,19 @@ Date:   Thu Feb 7 14:35:02 2008 -0500
 
     xselinux: Add getattr and setattr to the permission map for properties.
 
+commit 9d5edebe9664f4ac35b82830e000a72d5ca9cbe4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 7 21:22:50 2008 +1030
+
+    Xi: finish XKB initialisation before copying the keymap.
+
+commit 96eafa3d4f05997dac8be6a8d66a92410511824c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Feb 5 16:01:56 2008 +1030
+
+    xkb: when copying sections, make sure num_rows is set too.
+    (cherry picked from commit 41991fb991313202e8e6b513fe928ba14f8fcb87)
+
 commit 5c30327275509576b7848a5f842e7a1bffabe980
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Feb 5 21:06:05 2008 -0500
@@ -4164,6 +17627,23 @@ Date:   Fri Feb 1 14:13:29 2008 +1030
     
     Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
 
+commit e5e531ce96264518f278f572a4d0bfcd345aa618
+Merge: 6c38682 1692dcf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 31 16:36:17 2008 +1030
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	dix/events.c
+
+commit 6c38682084e24b18bac0ea75729b1183aeb01600
+Author: Benjamin Tissoires <tissoire@cena.fr>
+Date:   Thu Jan 31 15:51:32 2008 +1030
+
+    kdrive: AddInputClient takes a ClientPtr.
+
 commit 1692dcf197470d074f69d5af1608cb2ff1d08872
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Wed Jan 30 13:04:58 2008 +1030
@@ -4265,18 +17745,38 @@ Date:   Mon Jan 28 12:18:43 2008 -0800
     (cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)
 
 commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f
-Merge: 1a88aed... e915a26...
+Merge: 1a88aed e915a26
 Author: David Nusinow <dnusinow@debian.org>
 Date:   Sat Jan 26 16:13:25 2008 -0500
 
     Merge commit 'upstream/master'
 
+commit 0ac175597712edfeae676f536746a4d26d625e30
+Merge: 210eeef e915a26
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Jan 26 13:55:07 2008 +1030
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xext/sampleEVI.c
+
 commit e915a2639752bc0ea9e6e192e020cc2031c08063
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Jan 25 19:22:19 2008 -0500
 
     xselinux: Move the extension to extmod instead of being built-in.
 
+commit 210eeef495770c1883c842ff003c28ce25f279d4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Jan 26 09:39:54 2008 +1030
+
+    config: don't reset connection info on disconnect.
+    
+    If dbus is restarted, we try to connect again and this is difficult if the
+    busname and/or busobject is not set.
+
 commit f6a78ee143e3a3ad69538adf2b9675d724468ffa
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Jan 25 18:04:10 2008 -0500
@@ -4295,12 +17795,63 @@ Date:   Fri Jan 25 16:20:46 2008 -0500
 
     XACE: Don't need to actually register a protocol extension.
 
+commit d23266522390a4ef7203ae7c062b2b920e45f9d7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 25 13:54:47 2008 +1030
+
+    config: check connection != NULL before getting dbus' dispatch status.
+
+commit fb07fab2c07e7b0834724541dc47bfba02ba8574
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 25 13:45:22 2008 +1030
+
+    config: only shutdown libhal if the connection is valid.
+    
+    Thanks to libdbus' extensive use of assert we won't just get an error, it'll
+    bring the whole server down for us.
+
+commit 7732898aaa70e076000f6e6aa9420482896ed996
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 25 11:48:13 2008 +1030
+
+    config: add a debug message, fix a whitespace error.
+
 commit 46794d0c9665f07913980830d038c88d00407612
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Jan 24 19:49:13 2008 -0500
 
     xselinux: Rename SelectionManager to more generic SecurityManager.
 
+commit 466f6552190d1b83d66ebfd71e07921ed6210ee2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jan 23 16:11:31 2008 +1030
+
+    Xi: if deviceid is > 127 assume GE mask is for all devices (XiSelectEvent).
+
+commit 379f057646588fa3211d7ba0ec8d77d2fc0ad246
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jan 23 16:08:37 2008 +1030
+
+    Xext: add GEDeviceMaskIsSet (GE mask checking per device)
+    
+    If a mask was set for the NULL device, then we pretend the mask is set for all
+    devices.
+
+commit 91dc8c43d2343e494c59023484883f4683bdc639
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jan 23 15:45:02 2008 +1030
+
+    Xi: Change window access right check to RecieveAccess in XiSelectEvent.
+
+commit 94a6a65ae7414c8247aa1741ec5c7561e6f4bbe0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jan 23 15:43:48 2008 +1030
+
+    Xext: allow per-device GE masks.
+    
+    Instead of a single mask per client we allow the storage of a mask per client
+    per device.
+
 commit 6ffeecabb7f3f3173864e0f0af21a99bdc5b5044
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Jan 24 18:11:49 2008 -0500
@@ -4346,6 +17897,15 @@ Date:   Mon Jan 21 16:13:21 2008 +0100
 
     CVE-2007-6429: Always test for size+offset wrapping.
 
+commit ba315ae5ddd00763147a4b0cdcacba7691793dfc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 21 23:43:53 2008 +1030
+
+    Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)
+    
+    AddInputDevice checks for permissions already, so all we do is modify a few
+    callers to let AID sort it out.
+
 commit 94a21d757ce58254accbd5dd3a86810aadeec9f0
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Sat Jan 19 13:17:45 2008 +0100
@@ -4365,6 +17925,66 @@ Date:   Fri Jan 18 14:41:20 2008 -0500
     the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
     protected from overflow by the width and height checks.
 
+commit 6492d513c0022d70f838d1b2561442c7a41e401f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 21:44:22 2008 +1030
+
+    dix: if a client has a core grab, return the grab device on QueryPointer.
+    
+    The correct thing would be to return the ClientPointer. However, if the client
+    for some reason has a core grab on another device (e.g. as result of a passive
+    grab), return the coordinates of the grabbed device instead.
+    
+    This makes the use of nautilus a bit saner.
+
+commit cd2ad4c2ed58b49cee085174e77c242048159321
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 20:11:55 2008 +1030
+
+    dix: remove some superfluous lines in ProcChangeActivePointerGrab.
+
+commit 8a925d201efac52ef663ea3ff46acc5046178666
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 20:06:29 2008 +1030
+
+    dix: free the genericMasks when ungrabbing.
+    
+    This finally plugs a memory hole created by grabs registering for generic
+    events.
+
+commit 8949d81a3c79eef351d7c018c76692dcca74b63e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 19:45:54 2008 +1030
+
+    include: mark CoreProcessPointerEvent, CoreProcessKeyboardEvent as deprecated.
+    
+    ProcessOtherEvent does all the work now.
+
+commit d323fd64206ddb4221daa7cf7504daf62c5e7d90
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 19:17:42 2008 +1030
+
+    dix: remove inputInfo.pointer refernce in EventSelectForWindow
+    
+    If the window being changed is set as the motion hint window for any device,
+    the device's motion hint window is set to NULL. Which is kinda what the old
+    code did, except that it did it with only the VCP.
+
+commit 883811c2bed9c6fcb706effbf83ddc97518b6f0c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 18:48:46 2008 +1030
+
+    dix: remove inputInfo.pointer reference in TryClientEvents.
+    
+    Unfortunately, this requires a change in the TCE API, and thus a change in all
+    callers. Tough luck.
+
+commit 6e17184486c4309ec8b47c7cfd11fef60bb360ac
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 18 17:52:38 2008 +1030
+
+    Xi: Check for DestroyAccess when trying to delete a master device.
+
 commit 23f3f0e27dc90b7b3a375f2a5dd094e6f53552b5
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Sun Jan 13 14:00:25 2008 -0800
@@ -4456,6 +18076,50 @@ Date:   Wed Jan 16 14:24:22 2008 +0100
 
     Yet another Xv extension byte swapping fix.
 
+commit b0bf4308acb706abc87c51658c2251fa86231c35
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jan 15 19:15:09 2008 +1030
+
+    dix: print out an error when core type can't be converted.
+    
+    Helps a bit in tracking down bugs.
+
+commit 2a988ed75b7634d7cb6e83bb7aa89bc8768d3a58
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jan 15 19:14:46 2008 +1030
+
+    xkb: don't do core key repeats, XI only is the path to light.
+
+commit 4fd0885978be286a68b689824f1d910f929a52b0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jan 15 18:58:42 2008 +1030
+
+    Xi: remove some leftovers from ProcessOtherEvents.
+    
+    Core handling not needed anymore here.
+
+commit 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jan 15 15:22:39 2008 +1030
+
+    dix: Process an input event as a single event, instead of two separate ones.
+    
+    This is a significant shift in how input events are perceived. The common
+    approach was to treat a core event as a different entity than the XI event.
+    This could result in the XI event being delivered to a different client than
+    the core event. This doesn't work nicely if they come from the same device.
+    
+    Instead, we treat an input event as a single event, that is delivered through
+    two separate APIs. So when delivering an event, we first try the XI event,
+    then the core event. If the window want's neither, we go to the parent and
+    repeat. Once either core or XI has been delivered, the processing stops.
+    
+    Important: Different to the previous method, if a client registers for core
+    button events, the parent window will not get XI events. This should only
+    cause problems when you're mixing core and XI events, so don't do that!
+    
+    Generic events don't fit into this yet, they cause me headaches.
+
 commit 7a0d16ef0a103bcb25fa8a20322685f017aaf5a3
 Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
 Date:   Tue Jan 15 03:27:16 2008 -0200
@@ -4468,6 +18132,20 @@ Date:   Tue Jan 15 02:59:56 2008 -0200
 
     Fix Xephyr compilation without GLX.
 
+commit 0969a9f7497e10794a6534321c10a0e1ac680ad7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jan 15 11:31:12 2008 +1030
+
+    dix: Emulate core events within CheckDeviceGrabs and ComputeFreezes.
+    
+    This should restore the correct passive grab processing. When checking for
+    passive grabs, the core event is emulated and we check first for XI grabs on
+    the window, then for core grabs. Regardless of which event activates the grab,
+    the XI event is stored in the device's EQ.
+    
+    When replaying the event, we take the XI event and replay it on the next
+    window, again including the emulation of the core event.
+
 commit 1f83f40525acd3aff8f50b3c519bc1f307ff1e19
 Author: Dave Airlie <airlied@linux.ie>
 Date:   Tue Jan 15 10:20:50 2008 +1000
@@ -4484,6 +18162,14 @@ Date:   Sun Jan 13 19:50:37 2008 -0500
     
     Signed-off-by: Bernardo Innocenti <bernie@codewiz.org>
 
+commit a83a0c5a144da67dab96a857b849a5692b73245d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jan 13 16:14:29 2008 +1030
+
+    dix: remove obsolete comment.
+    
+    Pairings don't exist anymore and the documented issue is a non-issue now.
+
 commit 180a5aba4de3104fed8bc4e7d42a1e3a51575318
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Sat Jan 12 21:24:34 2008 -0800
@@ -4519,6 +18205,13 @@ Date:   Wed Jan 9 19:52:00 2008 -0800
 
     More Xv extension byte swapping fixes
 
+commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca
+Merge: 4e85c7c 0883e83
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 10 13:38:46 2008 +1030
+
+    Merge branch 'master' into mpx
+
 commit 0883e838e25227f0af84d2a90979175724166d16
 Author: Peter Harris <peter.harris@hummingbird.com>
 Date:   Wed Jan 9 14:52:33 2008 -0500
@@ -4531,6 +18224,19 @@ Date:   Wed Jan 9 18:42:58 2008 -0800
 
     Fix reference to old versions of XFree86 to not say "Xorg 4.2 or earlier"
 
+commit 4e85c7c322faf14c14e4229fa294b8e3d3a4d304
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jan 9 17:36:39 2008 +1030
+
+    Xi: keep a counter of buttons down to avoid duplicate press/release events.
+    
+    If two devices are attached to the same master device, pressing button 1 on
+    each of them leads to two button presses from the same device. Some apps
+    really don't like that.
+    
+    So we just put a counter in place and only send the first press and the last
+    release.
+
 commit e070c2cbef0d6fbbafce8d417e8b29231c2fdc50
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Fri Dec 7 20:18:49 2007 +1030
@@ -4564,6 +18270,22 @@ Date:   Tue Dec 18 13:57:07 2007 +1030
     wrong too.
     (cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e)
 
+commit 20ace6321ac464d821c67a82c7023f74ae038176
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 7 20:08:56 2008 +1030
+
+    dix: don't try to confine cursor on screen restructure if there is no cursor.
+    
+    Stops segfaulting when using xrandr. Yay.
+
+commit 57a491e6d3ebec464c0c861b02c9ddcb1cc62c3c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 7 20:06:32 2008 +1030
+
+    dix: init GrabPrivateKey to correct value.
+    
+    Merge detritus from last pull.
+
 commit 260505e3c5a18044e97d31ea3bcc0955e46335c8
 Author: David Nusinow <dnusinow@debian.org>
 Date:   Sun Jan 6 16:37:13 2008 -0500
@@ -4642,6 +18364,20 @@ Date:   Thu Jan 3 22:53:36 2008 -0500
     during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
     in their config file pScrn->pScreen is dereferenced and boom.
 
+commit 249b9b30c11e03bb113b37cf4712bf88debf6f05
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 4 13:49:48 2008 +1030
+
+    Xi: remove file for the obsolete ChangePointerKeyboardPairing request handling.
+
+commit e4a214e40d35aa957c83b86b4e4abc86c22fbde0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 4 13:32:53 2008 +1030
+
+    dix: don't free device's devPrivates manually, dixFreePrivates does it.
+    
+    Merge detritus from last pull.
+
 commit cd0603c2dc5ee000ebce66056bc1a72f99bfb617
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Jan 3 21:41:02 2008 -0500
@@ -4662,6 +18398,88 @@ Date:   Thu Jan 3 14:46:54 2008 -0500
 
     Bug #13794: Update MBE extension devPrivates to new interface.
 
+commit b2da44c76d68a76f20e90bccb268ebf65e132b49
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 3 18:51:44 2008 +1030
+
+    dix: DoChangeKeyboardControl shouldn't be using inputInfo.keyboard.
+
+commit 9cc41b88dfebb3f1e0a7cb5c224146e651a2cda4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 3 18:47:28 2008 +1030
+
+    Xi: ProcXSetClientPointer should directly check for the client from the id.
+    
+    The window ID includes the client ID anyway, so we might as well just look up
+    the client directly instead of trying to get the window first and the client
+    from the window.
+    
+    This also fixes a possible issue with XACE. If the client had permission to
+    write on the client but not on the window, the previous approach would have
+    failed.
+
+commit 521fdc28d86d091495da3558d26ab4a938250ffe
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 3 18:43:18 2008 +1030
+
+    xfixes: switch a few inputInfo.pointer to PickPointer
+
+commit 37194b13554f0d36343cf73324b128b15bb6a338
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 3 18:36:33 2008 +1030
+
+    Xi: switch to using "rc" (instead of "err") as returncode.
+    
+    All the rest of XI uses rc and returns rc in case of error, so make
+    mpx-related stuff comply. This stops the rest of XI sending the error
+    manually.
+    This is just a cosmetic change to be in line with the rest.
+
+commit c7e9b67c547c97b2c943eab555b4fe2844e8a91f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 3 18:09:56 2008 +1030
+
+    dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc.
+
+commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d
+Merge: eace889 ae869fc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 3 17:04:54 2008 +1030
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	XTrap/xtrapddmi.c
+    	Xext/security.c
+    	Xext/xprint.c
+    	Xext/xtest.c
+    	Xext/xvdisp.c
+    	Xi/exevents.c
+    	Xi/grabdevb.c
+    	Xi/grabdevk.c
+    	Xi/opendev.c
+    	Xi/ungrdev.c
+    	Xi/ungrdevb.c
+    	Xi/ungrdevk.c
+    	dix/cursor.c
+    	dix/devices.c
+    	dix/dixutils.c
+    	dix/events.c
+    	dix/getevents.c
+    	dix/main.c
+    	dix/window.c
+    	hw/xfree86/ramdac/xf86Cursor.c
+    	include/dix.h
+    	include/input.h
+    	include/inputstr.h
+    	mi/midispcur.c
+    	mi/miinitext.c
+    	mi/misprite.c
+    	render/animcur.c
+    	xfixes/cursor.c
+    	xkb/xkbAccessX.c
+
 commit ccf6636d2ca8acdaaeb8da34db507a10a082b0de
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jan 2 19:28:33 2008 -0800
@@ -5079,6 +18897,22 @@ Date:   Wed Dec 19 18:10:50 2007 +1030
     
     Thanks to Simon Thum.
 
+commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Dec 19 16:20:36 2007 +1030
+
+    include: never overwrite realInputProc with enqueueInputProc. Bug #13511
+    
+    In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
+    can overwrite the device's realInputProc with the enqueueInputProc. When the
+    grab is released and the events are replayed, we end up in an infinite loop.
+    Each event is replayed and in replaying pushed to the end of the queue again.
+    
+    This fix is a hack only. It ensures that the realInputProc is never
+    overwritten with the enqueueInputProc.
+    
+    This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
+
 commit bcad2a5a24f30cfdf9eca31915ed5a55ed094285
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Dec 18 20:19:26 2007 -0500
@@ -5113,6 +18947,16 @@ Date:   Mon Dec 17 23:11:29 2007 -0500
     of the current implementation!  At some point before the next release,
     XACE will switch back to a solid background as the default.
 
+commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 18 13:57:07 2007 +1030
+
+    dix: set the correct number of valuators in valuator events.
+    
+    (first_valuator + num_valuators) must never be larger than the number of axes,
+    otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
+    wrong too.
+
 commit 6a5c3e04fa43b98ccffd69ad86dd781602f88d0b
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Mon Dec 17 14:59:12 2007 +1000
@@ -5237,7 +19081,7 @@ Date:   Fri Dec 14 00:53:54 2007 -0500
     Bump video driver ABI and extension ABI for devPrivates rework.
 
 commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629
-Merge: 1c1a4bc... cb0d7e2...
+Merge: 1c1a4bc cb0d7e2
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Dec 14 00:32:24 2007 -0500
 
@@ -5285,7 +19129,7 @@ Date:   Thu Dec 13 15:55:28 2007 -0800
     (cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
 
 commit c8feb73f5841e7812d8dfdb91f1064e2033d028c
-Merge: 9a7ce57... a125ce4...
+Merge: 9a7ce57 a125ce4
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Dec 13 18:38:25 2007 -0500
 
@@ -5378,6 +19222,12 @@ Date:   Wed Dec 12 10:59:15 2007 -0800
     built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
     built.
 
+commit d86e7f2ecc0a0129a722ffaca93dfc7c0c60e842
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Dec 7 20:40:21 2007 +1030
+
+    dix: when getting a bogus event, at least print out the type.
+
 commit eab0c4e49015fe96f6d985316f9c5fa28a7eb1fe
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Mon Dec 10 20:57:24 2007 -0800
@@ -5528,6 +19378,27 @@ Date:   Wed Dec 5 21:36:34 2007 -0800
     Kill off assert macro
     (cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
 
+commit 3a058456e0ce531b21ae2b37be8868b8e0d56e56
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Dec 7 20:23:36 2007 +1030
+
+    mi: unify ErrorFs, prepend [mi]
+
+commit c5acf401dad6fbca47f2bb870185c1d08ac947a5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Dec 7 20:19:43 2007 +1030
+
+    mi: unify last two ErrorF's in mieq.c
+
+commit 117458d2db49efd3f04432ff45871b44c7d4ad57
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Dec 7 20:18:49 2007 +1030
+
+    mi: change infamous "Tossed event ..." error for something more explanatory.
+    
+    Few whitespace errors fixed.
+    Two ErrorF's prefixed with [mi].
+
 commit 8a8239f2e21795602fcff5281833b350e6b2a286
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Wed Dec 5 21:23:36 2007 -0800
@@ -5663,6 +19534,45 @@ Date:   Tue Dec 4 17:36:21 2007 -0500
 
     Restore xf86getsecs() as not having an ANSI equivalent.
 
+commit 447cd5d411875b62eb1a501bf00e604225b74d26
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 4 19:09:37 2007 +1030
+
+    dix: update comments about inputInfo.pointer.
+
+commit f44d7dcb5fefca3ddfd45e75d0bd0b47ec785e48
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 4 19:07:46 2007 +1030
+
+    dix: change the filters to be per-device.
+    
+    If we have one global filter, one pointer may change the filter value and
+    affect another pointer.
+    
+    Reproduceable effect:
+    blackbox and xterm, start dragging xterm then click anywhere with the other
+    pointer (attached to different masterd device!).  The button release resets
+    the filter[Motion_Filter(button)] value, thus stopping dragging and no event
+    is sent to the client anymore.
+    Having the filters set per device gets around this.
+
+commit 0931f40bf1bd6e00b8d95968d761a495b2c9a46c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 4 17:08:56 2007 +1030
+
+    dix: comments, whitespaces, copyright fixes.
+    
+    Removing my copyright message for now, should eventually be in line with the
+    rest of the messages.
+
+commit 09c0c1a3cc4807813774a3c0e28a7ba9a87bb5c7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 4 16:51:52 2007 +1030
+
+    dix: remove #ifdef XINPUT.
+    
+    No escaping XINPUT anymore.
+
 commit f8d7729df388c142624def36ba6d8c3b15922018
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Mon Dec 3 20:20:05 2007 -0800
@@ -5738,6 +19648,20 @@ Date:   Mon Dec 3 14:12:58 2007 -0500
     This has been deprecated since 1.1.  Since we're breaking ABI again anyway,
     remove it entirely.
 
+commit 28b93d74a11a1064d68a214fcaa7b0aede864a38
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Dec 3 14:32:53 2007 +1030
+
+    ephyr: miPointerWarpCursor needs the device parameter.
+    
+    Thanks to Mitchell Quille for spotting it.
+
+commit 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 30 13:56:04 2007 +1030
+
+    dix: Remove RegisterPairingClient and UnregisterPairingClient.
+
 commit f4dc521b38560c8f93b614316a3a5511941a93a9
 Author: Jeremy Huddleston <jeremy@tifa.local>
 Date:   Sun Dec 2 18:21:40 2007 -0800
@@ -5795,6 +19719,21 @@ Date:   Fri Nov 30 13:52:06 2007 +1000
     
     From RH bugzilla 306441
 
+commit 6216abe0c1a94efa4b2f0d14e88278f128304cd2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 30 11:34:24 2007 +1030
+
+    dix: avoid activating the VCP/VCK twice.
+    
+    This may set dev->key-xkbinfo to NULL, causing a segfault in xkb code lateron.
+    Spotted by David Huggins-Daines.
+
+commit 9eb8ea9e615ebd8b568711eeca36aa84aa781ad3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 30 11:32:59 2007 +1030
+
+    dix: only freeze the paired MD on a grab, not all other devices.
+
 commit 8a079be0dd0f2ce37868988cde4ac8895522b088
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Thu Nov 29 02:19:22 2007 -0800
@@ -5824,6 +19763,15 @@ Date:   Thu Nov 29 19:40:53 2007 +1100
 
     randr: make randr code not segfault when xinerama set
 
+commit e4fe0a3cb789b8757f1c80f606dfe32bccada582
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 29 09:55:24 2007 +1030
+
+    xkb: swap a LookupKeyboardDevice over in favour of GetPairedDevice
+    
+    The former always returns the VCK, which is obviously wrong if we have
+    multiple devices.
+
 commit 23b8ca8a373d919225de9739af7b064f650eceec
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Nov 27 13:20:40 2007 -0500
@@ -5845,6 +19793,17 @@ Date:   Tue Nov 27 10:22:44 2007 +1030
     Spotted by Simon Thum.
     (cherry picked from commit 0f2398d06ce591724e388b3270800c5e22b3de2d)
 
+commit 0f2398d06ce591724e388b3270800c5e22b3de2d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 27 10:22:44 2007 +1030
+
+    Xi: set DeviceXXXState's length fields to the correct size of the struct.
+    
+    Setting it to the size of a pointer is an interesting but equally wrong
+    approach. Luckily Xlib never used this field anyway so nobody got hurt so far.
+    
+    Spotted by Simon Thum.
+
 commit 601307615e4955be23fd86a057285074242ad83e
 Author: Jeremy Huddleston <jeremy@yuffie.local>
 Date:   Mon Nov 26 13:04:57 2007 -0800
@@ -5908,6 +19867,39 @@ Date:   Mon Nov 26 15:38:20 2007 +0100
     
     Asking for trouble if non-initialized values contain random data.
 
+commit a4edfbef022f9635c2c9b9eb229cb622834dc68c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Nov 24 16:16:48 2007 +1030
+
+    mi: only call UpdateSpriteForScreen if the screen actually changed.
+    
+    If we call it unconditionally, we flip the dev->spriteInfo->sprite permanently
+    when using XTestFakeInput (once in CheckMotion as called from the
+    processInputProc, another time in UpdateSpriteForScreen when we actually warp
+    the cursor). USFS also updates to the screen's root window unconditionally,
+    which is not really what we want if we haven't changed screen at all.
+
+commit bf3198c8c56289244c58d36c6869442479fd3481
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Nov 24 15:00:57 2007 +1030
+
+    dix: fix typo
+
+commit 5dabe448bda68a483bf444a4adfed2b25b30f600
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Nov 24 15:00:43 2007 +1030
+
+    dix: Add special treatment of NotifyUngrab for enter/leave events.
+    
+    In some cases (e.g. using x2x) the previous model broke, with a window ending
+    not counting down to 0 anymore. Special treatment for NotifyUngrab seems to
+    help here.
+    
+    Current solution: If a NotifyGrab is to be sent ignore it. If a NotifyUngrab
+    enter is sent, only adjust the semaphore if it is on 0. Likewise, do the same
+    for a NotifyUngrab leave if the semaphore is on 1. This seems to work alright
+    so far.
+
 commit 33b94da6327d3423b4ebc1a58d5894c9904e67c9
 Author: Keith Packard <keithp@keithp.com>
 Date:   Fri Nov 23 16:01:11 2007 -0800
@@ -6016,6 +20008,15 @@ Date:   Wed Nov 21 23:30:37 2007 -0800
 
     Darwin: Removed .svn dir
 
+commit 691da031319dc59b9496101358c267f317abfd1e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 22 17:44:39 2007 +1030
+
+    Xi: allocate motion history for master device.
+    
+    We're still missing out on the actual content of the history but at least this
+    way we don't segfault.
+
 commit 602de4f70b6f4aab93b514f3a01917bd5d4ad640
 Author: Jeremy Huddleston <jeremy@tifa.local>
 Date:   Wed Nov 21 16:53:10 2007 -0800
@@ -6117,6 +20118,16 @@ Date:   Wed Oct 31 03:22:18 2007 -0700
     (I.e. it wasn't releasing Command before clicking the fake button.)
     (cherry picked from commit 0d5dd5dffa4c5ce3f54dfe53720a39d524dc8e37)
 
+commit f9269bebae27bbc9d0e03e02943166b83946623d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 22 17:30:14 2007 +1030
+
+    DeviceIntRec: move lastx/lasty from valuator into DeviceIntRec.
+    
+    We free the ValuatorClassRec quite regularly. If a SIGIO is handled while
+    we're swapping device classes, we can bring the server down when we try to
+    access lastx/lasty of the master device.
+
 commit 7f2972d47a5d74fe92268c6d609b1eb6ad845824
 Author: Jeremy Huddleston <jeremy@tifa.local>
 Date:   Wed Nov 21 21:59:59 2007 -0800
@@ -6131,6 +20142,29 @@ Date:   Wed Nov 21 19:51:14 2007 -0800
     Imported changes from xorg-server-1.2-apple to make master more current wrt
     file layout, build system changes, and dead code removal.
 
+commit 9ed43eff48201520797f89a12bb3b2f5819bd99f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 21 17:16:27 2007 +1030
+
+    Xi: allow clients to specify pure client id in SetClientPointer.
+    
+    If no window was found with the given ID, try if there's a client with the ID.
+    Allows us to set the CP for apps that don't open windows (e.g. x2x).
+
+commit 33f15689922ad9f1193f803bc1636c82c23ab99e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 21 16:06:44 2007 +1030
+
+    xtest: switch an inputInfo.pointer over to PickPointer.
+    
+    Couple of whitespace fixes too.
+
+commit e5dd7a95791748c57cab75c0d8ba9d37f72edccf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 21 15:59:31 2007 +1030
+
+    Xext: Scruffy the janitor don't like no "register" keywords.
+
 commit a55ec1a9f4b62139dc5e5462d79d47b330c27c79
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Nov 20 18:31:03 2007 -0800
@@ -6562,7 +20596,7 @@ Date:   Mon Nov 19 21:01:22 2007 -0500
     	during merge conflict resolution.
 
 commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94
-Merge: 60be452... ea9c63e...
+Merge: 60be452 ea9c63e
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Nov 19 18:10:46 2007 -0500
 
@@ -6618,6 +20652,18 @@ Date:   Sun Nov 18 11:39:26 2007 -0500
 
     Document the requirement for interleaved code and declarations.
 
+commit bad96e5a864e40fbd47265d7fb6eaa67c55fac11
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Nov 18 15:02:24 2007 +1030
+
+    dix: getevents.c remove trailing whitespaces.
+
+commit 75e5e9f88c5f974d996dd81e672cd3709d361a44
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sat Nov 17 13:46:01 2007 +1030
+
+    Xi: add missing XI_DeviceClassesChangedMask to XI filters array.
+
 commit d15339a92c4d689d2ab8a86e4f10107f3e45eff8
 Author: Adam Jackson <ajax@aspartame.nwnk.net>
 Date:   Sat Nov 17 22:12:10 2007 -0500
@@ -6650,6 +20696,53 @@ Date:   Fri Nov 16 19:53:11 2007 -0500
     
     Currently just reads from /dev/urandom, and only on Linux.
 
+commit 12dd6e9911de187e0ebee86434e8c24a67c990f9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 16 17:23:09 2007 +1030
+
+    dix: reset MD's devPrivate classes to NULL before device initialisation.
+    
+    XkbInitKeyboardDefviceStruct may call FatalError if it fails. FatalError then
+    cleans up all the devices, resulting in a segfault if the pointer is
+    uninitialised.
+
+commit be3321c2e9fad228a9ee5fef47680a47bc9e39a4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 16 12:12:41 2007 +1030
+
+    dix: Free both current classes and original classes when closing an MD.
+
+commit 3c39dd19ec2a53b8854279e3b03131098031473a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 16 12:12:14 2007 +1030
+
+    Xi: Deep-copy full list of FeedbackClasses.
+    
+    All feedback classes are linked lists and the whole list has to be duplicated,
+    not just the first entry.
+    
+    Xkb stuff still missing.
+
+commit 497862df2fcd67531fbe0f876c20a09884ee74df
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 16 11:20:22 2007 +1030
+
+    dix: explicitly float all attached SDs before closing down devices.
+    
+    Some drivers flush on shutdown, if our SD is still attached we'd be trying to
+    route an event through a non-existing device.
+
+commit 9de1ebe2a80164507cbe2ef688f284225e0ec808
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 16 10:45:28 2007 +1030
+
+    dix: Fix up class restoring when last SD disconnects.
+    
+    Old code was fundamentally broken, fixes now are:
+    - free the MDs current device classes
+    - copy the device classes instead of flipping the pointers
+    - check for the old MD, not the new one.
+
 commit 20fd4783247b1b93d9675dc36768dd1ed59ba2d3
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Thu Nov 15 17:01:33 2007 -0500
@@ -6718,12 +20811,100 @@ Date:   Thu Nov 15 13:32:59 2007 -0500
 
     Don't sleep(1) at exit on any platform.
 
+commit 83926cb8bef6288b89e801c5e60b3f40e923e16e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 17:41:07 2007 +1030
+
+    Xi: Only alloc modifierKeyMap if <slave device>->maxKeysPerModifier > 0
+    
+    Sometimes (e.g. on my debian ppc box) maxKeysPerModifier of the SD is 0. So we
+    try to malloc(0), bringing the whole server down with a FatalError because it
+    looks as if the malloc failed. This is bad, so only alloc if we actually have
+    something to alloc.
+
+commit 070195dbf88eb121e65f802e023aa37ed1f2c2ac
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 16:27:18 2007 +1030
+
+    Xi: fix up sloppy class copying causing segfaults.
+
+commit 53539688cab990a7df1851d64f3ee4e11920a86b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 16:23:48 2007 +1030
+
+    dix: SetKeySymMap should alloc the map if dst doesn't have one already.
+
+commit b40646dc104fb03ea7cc0b27fae573aecaab486e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 15:43:44 2007 +1030
+
+    dix: Add FreeDeviceClass and FreeFeedbackClass for centralised xfree.
+    
+    Ensures that we only have one way of freeing a device class to avoid leaks in
+    ChangeMasterDeviceClasses and other places.
+
 commit 4c9cc82fc4461d180ae2c2fbe50e7f98b0777f91
 Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
 Date:   Thu Nov 15 01:46:11 2007 -0200
 
     For some reason "-nozap" appeared twice. Weird.
 
+commit 18833d648fd7e1a5e962b93636bbbb38aca9c454
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 12:13:59 2007 +1030
+
+    Xi: reset xkb-stuff to NULL after copying (DeepCopyDeviceClasses)
+    
+    Having two devices point to the same xkb stuff causes SIGABRTs.
+    
+    Also, don't init a MD's xkbInfo unless the SD has an xkbInfo.
+
+commit 1635832c1635374033686d3a943b77adbd60bb98
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 11:35:07 2007 +1030
+
+    Revert "xkb: disable xkb key repeats (temporarily)"
+    
+    This reverts commit 2b1d946392ce28b96941341778b2b526aa0fb126.
+
+commit b05246696d14bd35aa53b49302707b51206c72a6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 11:31:43 2007 +1030
+
+    Xi: free XkbSrvLedInfos as well when freeing an MD's device classes.
+
+commit c758e5a664a52045ad419340044beebb6774a336
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 10:47:20 2007 +1030
+
+    dix: Make sure core MDs copy their initial classes before they are used.
+    
+    Anything in dev->key, dev->valuator etc. of a MD must always be a copy of the
+    original class. The intial classes of an MD (the ones set up before an SD is
+    attached) as well, as we may have to restore them if no SD is attached
+    anymore.
+
+commit a08665d4d3b0a7d567a90bb9bbfe4abafd6f3887
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 10:42:29 2007 +1030
+
+    mi: don't call SwitchCoreKeyboard, we switch during event processing now.
+
+commit 64711a094893e83764bbeda538c6e877ebe2af79
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 15 10:41:34 2007 +1030
+
+    Xi: When switching MD classes, make a deep copy instead of pointer flip.
+    
+    Turns out it's really really hard synchronising device state across multiple
+    duplicated events if they all share the same struct. So instead of doing so,
+    when the SD changes deep-copy all it's classes into the MD. The MD then has
+    the same capabilities, but the state can be set separately. This should fix
+    xkb, key state, repeat etc. problems.
+    
+    Updating the device state allows us to remove the SwitchCoreKeyboard from the
+    event gathering, it's all done during event processing now.
+
 commit 3dde66f96b9b8431381871cf85266da3ec57a0d4
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Nov 14 15:10:59 2007 -0500
@@ -6743,7 +20924,7 @@ Date:   Thu Nov 8 17:25:36 2007 -0500
     Don't sleep(1) at server exit.
 
 commit 1603130236c55ddabc3854d4ba62d544debcf1f5
-Merge: f207e69... f7dd0c7...
+Merge: f207e69 f7dd0c7
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Nov 14 13:35:50 2007 -0500
 
@@ -6760,6 +20941,97 @@ Date:   Wed Nov 14 12:23:29 2007 -0500
 
     xselinux: adjust receive hook to use new synthetic_event class.
 
+commit cc4586df600af571815d5cdda2028c0d074c8469
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 14 14:27:52 2007 +1030
+
+    Xi: toggle the public.devPrivate as well when switching device classes.
+    
+    The master needs to have the same devPrivate as the slave, in case a client
+    issues a request that goes down to the driver.
+    Example: if a driver wants to ring the keyboard bell, it'll pick a keyboard.
+    The KeyClassPtr will direct it to the matching method in the driver, but
+    because the MD doesn't have the devPrivate set the driver segfaults.
+    Even if all drivers were updated to not dereference the nullpointer, nothing
+    would actually ever happen.
+    
+    To avoid this, we flip the master's public.devPrivate to the last SDs
+    devPrivate.
+
+commit b44c1118f3bab6d5f28fa42e0c322fbaec005012
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 14 14:08:21 2007 +1030
+
+    dix: Return Success from ProcBell if no BellProc is set.
+    
+    We must not return BadDevice, this causes applications to crash. If no
+    BellProc is set, just quietly do nothing and report a Success.
+
+commit 240b10fa9c32510a380a73a8acdd8267c81e538b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 14 12:18:08 2007 +1030
+
+    Xi: Move updating the device state from POE into separate function.
+    
+    POE now only deals with processing the event and calling the appropriate
+    delivery methods. Actually modifying the device state is done in
+    UpdateDeviceState. This separation should make it easier to avoid setting the
+    state twice when master events are processed.
+
+commit 0bdfeb55fc559ffe0334df69ba6e9e711b26dc18
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 13 17:31:20 2007 +1030
+
+    Xi: remove RegisterPairingClient handling. Deprecated with device hierarchy.
+
+commit e96d926d64f7fb63f6bf2aa0ea0a8440a188947b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 13 17:14:35 2007 +1030
+
+    Xi: remove trailing whitespaces.
+
+commit 5031238aad2b6b7511aab0f9d15edfbdd2b4cce7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 13 16:58:23 2007 +1030
+
+    dix: remove trailing/wrong whitespaces from devices.c and events.c
+
+commit c703849e79391bb1bb01a994bb8d5cf2eb64e48b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 13 16:50:18 2007 +1030
+
+    dix: Attach spriteInfoRec to same memory block as the DeviceIntRec.
+    
+    No need to alloc a separate one, we never do anything special with it anyway.
+
+commit 51239f87ce42ad564ceee1761980391947294511
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 13 11:26:16 2007 +1030
+
+    dix: Send MappingNotify when keyboard maps change.
+    
+    If a slave device is attached to a master device, then we need to send a
+    mapping notify to the client.
+    Mapping notify needs to be sent if
+     - different slave device but on same master
+     - different master
+    
+    This gives you funny behaviour with the ClientPointer. When a
+    MappingNotify is sent to the client, the client usually responds with a
+    GetKeyboardMapping. This will retrieve the ClientPointer's keyboard mapping,
+    regardless of which keyboard sent the last mapping notify request. So
+    depending on the CP setting, your keyboard may change layout in each app...
+
+commit 2b1d946392ce28b96941341778b2b526aa0fb126
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 13 09:51:33 2007 +1030
+
+    xkb: disable xkb key repeats (temporarily)
+    
+    Haven't quite figured out yet how to make these repeats work. Because we share
+    the class between devices, the key state is already set when we process the
+    master device's event, causing a repeat on each event.
+
 commit f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca
 Author: Matthias Hopf <mhopf@suse.de>
 Date:   Mon Nov 12 15:11:03 2007 +0100
@@ -6770,6 +21042,38 @@ Date:   Mon Nov 12 15:11:03 2007 +0100
     crtc of an output could be NULLed if the crtc was shared (cloned) between two
     outputs and one of them got another crtc assigned.
 
+commit 70b4087c4dd1904d9d655f4afb9dfcea4f137f7a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 12 13:10:39 2007 +1030
+
+    dix: don't unconditionally update valuators during key events.
+    
+    Master may not have valuators, device may not have valuators.
+
+commit 23365d28651f7942fdafb889bcbbd019470a4274
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 12 13:08:38 2007 +1030
+
+    dix: allow grab modifier device to be NULL.
+    
+    This can happen if we check for a passive core grab and our device is a
+    floating slave device. Doesn't really change anything as SDs can't send core
+    events but it stops the server from segfaulting.
+
+commit 5a7a65a3c978a65e8ff39d0cc9878527ec42adc9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 12 12:37:39 2007 +1030
+
+    mi: avoid SIGABRT by setting master_event to NULL.
+
+commit a05f43bf3e9629df98e93c366d4327f20ed81e6c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 12 11:35:18 2007 +1030
+
+    dix: When the last slave is removed, set master to the original classes.
+    
+    DeviceClassesChangedEvent is sent to the client, where device == new slave.
+
 commit 45f884d79c0eebaa1eb24d7db76c1177f6b710c9
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Nov 9 14:45:27 2007 -0500
@@ -6782,6 +21086,29 @@ Date:   Fri Nov 9 14:45:02 2007 -0500
 
     registry: Register XC-SECURITY extension protocol names.
 
+commit 7a81bafc9bc7048560b17483e6addf58469a05d0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 9 23:10:24 2007 +1030
+
+    Xi, dix: Add ability to change MD classes + send event when doing so.
+    
+    Each time a different slave device sends through a master, an
+    DeviceClassesChangedEvent is enqueued. When this event is processed, all
+    classes of the matching master device are changed, and the event is sent to
+    the clients.
+    
+    Next time the master is queried, it thus shows the evclasses of the last slave
+    device. The original classes are stored in the devPrivates.
+    
+    TODO: if all slave devices are removed, the master's original classes need to
+    be restored.
+
+commit c0a05805783ee3d38fbcc0fb45f4aa3c511785f0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 9 23:07:10 2007 +1030
+
+    Xext: add simple macro to easily check a generic event's type.
+
 commit f48087b6c33c1f84bf2cfc0744b1c38697321c07
 Author: Kristian Høgsberg <krh@temari.boston.redhat.com>
 Date:   Fri Nov 9 05:49:26 2007 -0500
@@ -6884,6 +21211,24 @@ Date:   Sat Nov 3 05:34:19 2007 -0700
     for the notification from Xplugin that our window has been moved,
     and then we ask X11 to move the window to the new location.
 
+commit 5bbc468b702f62d7c91d41aabcc27eeb553f6959
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 9 11:33:27 2007 +1030
+
+    dix: grabbing an attached SD sets it floating for the duration of the grab.
+
+commit 676b26ca3e9b142cf007af3f439aa1993f2247c4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 8 17:54:17 2007 +1030
+
+    Xi: notify the clients when the device hierarchy has been changed.
+
+commit cb75f09146a3c17b1a67b636bbf7229c65c83b35
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 9 11:29:18 2007 +1030
+
+    dix: calloc root window's Generic Event mask, stops segfaults.
+
 commit 169f83e366f678ac5441ad21beb84c9b8c65d28e
 Author: Ben Byer <bbyer@bbyer.local>
 Date:   Sun Nov 4 19:14:10 2007 -0800
@@ -6919,14 +21264,55 @@ Date:   Thu Nov 8 09:11:05 2007 +0100
 
     Xephyr: do not AM_CONDITIONAL inside a shell if branch
 
+commit 59b304d8a24fecd094296feb217823f0c73d6f82
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 8 15:44:18 2007 +1030
+
+    dix, mi: stop segfaults when a floating device emits events.
+    
+    For pointers: don't try to set master->valuator fields if there is no master.
+    For keyboards: check if device is valid before trying to access the fields in
+    miPointerGetScreen (btw. this disables DGA events for floating keyboards).
+    
+    Also stop the hideous number of ErrorFs if we request the paired device for a
+    floating dev.
+
+commit 3063f0c6679bdbea13f360cff8d09a88b9871da9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 8 11:51:03 2007 +1030
+
+    mi: change the device id to the master devices' when duplicating the event.
+    
+    Move the event duplication into a CopyGetMasterEvent(), makes the code a bit
+    better to read.
+
 commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
 Author: Keith Packard <keithp@koto.keithp.com>
 Date:   Wed Nov 7 16:33:10 2007 -0800
 
     Don't frob timers unless SmartSchedule is running
 
+commit 180220f284823c486e7001ef00f1279dc548c9c7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 8 10:00:35 2007 +1030
+
+    Xi: return BadDevice for slave devices on ProcXSetClientPointer
+    
+    Also clean up to return error codes instead of sending the error manually.
+
+commit 184a7b8917a15bb2c719153b9b016c03aab42101
+Merge: a8808ac 0b72905
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 8 09:34:35 2007 +1030
+
+    Merge branch 'mpx' into mdsd
+    
+    Conflicts:
+    
+    	Xi/opendev.c
+
 commit e94ab0b502160376d1956345196f7e1c7e2e886f
-Merge: 26e1fc7... 9bee1c6...
+Merge: 26e1fc7 9bee1c6
 Author: Dodji Seketeli <dodji@openedhand.com>
 Date:   Wed Nov 7 19:04:24 2007 +0100
 
@@ -6964,6 +21350,29 @@ Date:   Wed Nov 7 18:43:16 2007 +0100
             * hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
               XNEST_LIBS contains the right thing.
 
+commit 0b729051c04da7068f1e6dd319190bd0a362b2c0
+Merge: b7ee005 d7c5e8b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 7 15:37:23 2007 +1030
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xi/extinit.c
+    	Xi/grabdev.c
+    	Xi/setmode.c
+    	Xi/ungrdev.c
+    	dix/devices.c
+    	dix/events.c
+    	dix/getevents.c
+    	include/dix.h
+    	mi/midispcur.c
+    	mi/misprite.c
+    	xkb/xkbActions.c
+    	xkb/xkbEvents.c
+    	xkb/xkbPrKeyEv.c
+
 commit e717409bae355df9a617a226f12fbb8c54ae77e5
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Nov 6 21:36:13 2007 +0000
@@ -7003,6 +21412,24 @@ Date:   Tue Nov 6 14:52:03 2007 +0000
     the RemoveResourceClient call first, as there's not much point in
     notifying clients while we're shutting the server down anyway.
 
+commit a8808ac3d093f33b39de109107d396fe0a02c4fc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 7 11:42:58 2007 +1030
+
+    Xi: don't call CheckMotion for slave devices.
+    
+    This essentially disables enter/leave for slave devices, but re-enables them
+    for master devices. Which is a good thing after all.
+
+commit 15944b8f02752eedd61be34a6a29dd6b82a0ac97
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 7 11:33:24 2007 +1030
+
+    mi: duplicate event before processing it, so master has original values
+    
+    Event values may get changed in the event processing stage, so we need to
+    duplicate it to pump different events through for slave and master device.
+
 commit d7c5e8bfc1aecbd23a4cbb2eab08656587aac2e8
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Nov 6 16:26:09 2007 -0500
@@ -7023,7 +21450,7 @@ Date:   Tue Nov 6 16:26:09 2007 -0500
     on the x11perf benchmark.
 
 commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500
-Merge: 868e303... ddce48e...
+Merge: 868e303 ddce48e
 Author: Dodji Seketeli <dodji@openedhand.com>
 Date:   Tue Nov 6 16:25:40 2007 +0100
 
@@ -7050,7 +21477,7 @@ Date:   Tue Nov 6 09:40:14 2007 +0000
     to subsequent assertion failure in libdbus.
 
 commit a52c9b2a59f27266557ff9d5d2c08492e04135a6
-Merge: c7e18be... 5833289...
+Merge: c7e18be 5833289
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Nov 5 19:08:36 2007 -0500
 
@@ -7078,7 +21505,7 @@ Date:   Mon Nov 5 15:01:13 2007 -0500
     xselinux: Register SELinux extension protocol names.
 
 commit 632c33c5c18b3e091c4fce98280af4d583e99640
-Merge: 4113f04... dda10c9...
+Merge: 4113f04 dda10c9
 Author: Dodji Seketeli <dodji@openedhand.com>
 Date:   Mon Nov 5 17:52:33 2007 +0100
 
@@ -7748,7 +22175,7 @@ Date:   Thu Oct 25 12:35:01 2007 -0400
     xselinux: Label the default device directly with the process context.
 
 commit b633d54b94d746d26e13014634d9f63bbb7e8f7d
-Merge: 4b05f19... 48ca596...
+Merge: 4b05f19 48ca596
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Oct 25 12:19:30 2007 -0400
 
@@ -7810,6 +22237,21 @@ Date:   Tue Oct 23 20:58:48 2007 -0400
     Probably not fully baked yet.  It's difficult to test since so few apps
     actually follow the ICCCM with respect to cut & paste.
 
+commit b7ee005d327372c1e414ee6c526f9f7aee14bc86
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 24 10:26:12 2007 +0930
+
+    dix: Don't interfere grabs the interfering device is of different type.
+    
+    A pointer device should be able to send events while the client has a core
+    grab on a keyboard device, and likewise.
+
+commit 02508614b9f882ba1559fb4581dcf812118fdf89
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 24 10:09:18 2007 +0930
+
+    dix: check for core passive grabs on inferiors when replaying events.
+
 commit 825f09dffd94cfcd0562a01c5181998503851461
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Oct 23 17:12:57 2007 -0400
@@ -7858,6 +22300,16 @@ Date:   Tue Oct 23 15:39:23 2007 +0200
 
     Get rid of unnecessary GNU extended variadic macro.
 
+commit 7ef863720dc79107fc2cd17ce684366c87e001a4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 23 17:28:03 2007 +0930
+
+    dix: Create new sprite for floating devices.
+    
+    Floating devices get sprites, but still aren't spriteOwners. This prevents
+    them from getting rendered, and also stops segfaulting.
+    (not really solving the problems with keyboards though)
+
 commit d808d653d1fc16f1d5af76ab00fa862fb80fa3ba
 Author: David Nusinow <dnusinow@debian.org>
 Date:   Mon Oct 22 21:30:04 2007 -0400
@@ -7925,7 +22377,7 @@ Date:   Fri Oct 19 16:34:54 2007 -0700
     they should be.
 
 commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a
-Merge: a358b87... 7e1cada...
+Merge: a358b87 7e1cada
 Author: Eric Anholt <eric@anholt.net>
 Date:   Fri Oct 19 15:44:17 2007 -0700
 
@@ -7970,6 +22422,41 @@ Date:   Fri Oct 19 17:20:21 2007 +0200
 
     Fix ids of ACPI events according to ACPI spec.
 
+commit d9caa469b9bb4eb6125b890820853062fc2c4441
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Oct 19 15:26:09 2007 +0930
+
+    Xi: allow VCP/VCK to be OpenDevice'd as well.
+    
+    All devices deserve to be equal. Except master devices, they are a bit more
+    equal than the others.
+
+commit 155e2c559ed0dbf31b6d39d48648a3ee22b37635
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Oct 19 14:37:07 2007 +0930
+
+    Xi: advertise as XInput v2 capable
+
+commit 5ba738935f0d786e4670adf3b05ad42fc5e710fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Oct 19 14:36:37 2007 +0930
+
+    Xi: remove ChangePointerKeyboardPairing in favour of ChangeDeviceHierarchy.
+
+commit 6dcde0e9c1d068d9fc4a772d29d1d4c6cc57aeb9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Oct 18 12:21:07 2007 +0930
+
+    Xi: set master device's id in ListDevices Reply.
+
+commit cfcc6e14b9a15f7979ba0df9c105cf563bef98fa
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Oct 19 11:28:44 2007 +0930
+
+    Xi: return all master devices as type IsXPointer/Keyboard when listing devs.
+    
+    Slave devices are reported as IsXExtensionPointer/Keyboard.
+
 commit 8e3c1dfc48930c455529313a42efa35e3b9071b2
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Thu Oct 18 21:01:51 2007 -0400
@@ -8096,7 +22583,7 @@ Date:   Wed Oct 17 16:09:40 2007 -0400
     Need to merge so this type of thing stops happening.
 
 commit c3f7b862550fa8f46633162f83db8c27e46fc672
-Merge: af4dde0... feac075...
+Merge: af4dde0 feac075
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Oct 17 15:00:54 2007 -0400
 
@@ -8146,6 +22633,40 @@ Date:   Wed Oct 17 10:50:22 2007 +0800
 
     KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
 
+commit 9aadde377991bfbd88524d02106bec3dedd6e7c9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 17 12:05:50 2007 +0930
+
+    mi: don't call UndisplayCursor for non-sprite-owners.
+    
+    Segfaults are bad.
+
+commit 8b7c4249d82d07e852d8d8c15c7ab9977dd1f31c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 17 10:41:58 2007 +0930
+
+    mi: call processInputProc for master devices after slave event processing.
+    
+    More work is needed to sort out grabs though.
+
+commit ae9fc10adec8f9bf0492d14d435f8f11e0163b27
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 17 10:41:04 2007 +0930
+
+    Xi: don't send core events for slave devices.
+
+commit de70cfdbe60eb6e7bf3e74dfd1ac34de554deff1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 17 09:52:30 2007 +0930
+
+    mi: fix some macros to allow multiple cursors for master devices.
+    
+    Macros defaulted to inputInfo.pointe rfor devices that weren't spriteOwners.
+    Changed to take the device's master device now.
+    
+    This includes sticking in a number of checks and warnings that cursor
+    rendering won't be called for floating devices.
+
 commit 773f6491c1cc8819038e753d08c32ba213f80f8f
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Oct 16 19:11:36 2007 -0400
@@ -8168,12 +22689,154 @@ Date:   Tue Oct 16 12:46:07 2007 +0200
     Fixes spurious GLX protocol errors because __glXGetDrawable doesn't set the
     error code in case of success. Maybe it should, though.
 
+commit 1d9ebbac8c589cae7e4952083692b6d148def9bc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 18:46:12 2007 +0930
+
+    dix: Make InitCoreDevices use AllocMasterDevice.
+    
+    Also change naming a bit, append "pointer" and "keyboard" to master devices
+    instead of -ptr and -keybd.
+
+commit 299573f4617c3b5599bb65069e96d050277b9471
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 18:40:15 2007 +0930
+
+    dix: add AllocMasterDevice for creation of new master devices.
+    
+    Devices are initiated pretty much the same as the core devices.
+
+commit 5fe9bfd23f17b84c3afaa82f75a7c517c9f8e0d3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 18:23:48 2007 +0930
+
+    xfree86: NIDR: don't call PairDevices explicitly.
+             set isMaster to FALSE explicitly.
+    
+    Pairing isn't necessary, attachment should be done in EnableDevices.
+
+commit 5eb033835e92ea951cc385fd709af9656b3772d8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 18:03:52 2007 +0930
+
+    mi: don't exclude inputInfo.pointer from rendering.
+
+commit b697c4ed145968d3c3281bb85e628f1b068b09fc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 17:47:06 2007 +0930
+
+    dix: CheckPassiveGrabOnWindow: only get paired device for non-keyboards.
+
+commit caa69d8f7b92b80669df02e1001409d7c653e7e4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 17:38:13 2007 +0930
+
+    dix: fix detritus from adding lastSlave field.
+
+commit 90d077e537ac4cb7d79d67afcf3984a3e8d65fe8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 17:37:33 2007 +0930
+
+    dix: GetPointerEvents: get state from master device before applying valuators.
+    
+    We need to get lastx/y from the master device before we start applying
+    acceleration etc. Otherwise we get jumping cursors, which is reasonably bad.
+
+commit b6ccf721b0a582150858d68f91967fb4e319c340
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 17:35:06 2007 +0930
+
+    include: add "lastSlave" field to DeviceIntRec.
+    
+    Set to the last slave device that routed events through the master.
+
+commit e6bd8ae0608bd8379c5ac962f69cd0bcc54f9734
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 15:59:30 2007 +0930
+
+    dix: set the device's sprite when using AttachDevice
+    
+    Sprite is set to the master device's sprite.
+
+commit 271d4c3d6255318aabb9ad1ea444f534ed456f0b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 15:50:07 2007 +0930
+
+    xfree86: remove XI86_SHARED_POINTER flag.
+    
+    Not needed anymore. By default, all devices are slaves of first master device.
+
+commit c7b878b90406781c97db751a9b454e2b6baee0e1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 15:07:31 2007 +0930
+
+    dix: don't treat VCK/VCP separately in DevHasCursor, IsPointer/KeyboardDevice.
+
+commit e9f149fb56747f7eaa0f714dce97b067b007c47e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 14:24:20 2007 +0930
+
+    Fix up detritus from removing GetPairedPointer/Keyboard.
+
+commit 840bde3d32f3627dfc3d7d8b6564a61a8014933b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 13:09:35 2007 +0930
+
+    dix: GetPairedDevice: return dev paired with master for slave devices.
+
+commit 6c259a08d917f94fd7381453b625b07826d3ef9c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 13:09:19 2007 +0930
+
+    include: remove unused GetPairedPointer/Keyboard declarations.
+
 commit fe97f7c54a1b42acd542696b6cdc9e83e89548f3
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Oct 15 22:46:08 2007 -0400
 
     registry: Add some missing #include's.
 
+commit 9ecbbf198f4cec398897736e173e7e8c56bf6f94
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 08:00:06 2007 +0930
+
+    dix: adjust PickPointer and PickKeyboard to get the first master device.
+    
+    Simplifies it a lot, since we always have at least one master device
+    available at all times, so less mucking around.
+
+commit 0c5f65ecd3ad11fbdb1cab3cb1d0eb4f33bb4e35
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 07:57:24 2007 +0930
+
+    dix: don't allow slave devices as ClientPointer
+
+commit 9ccc9ab6f29f68298b68cdb5c9b4bd57a095f05a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 07:53:00 2007 +0930
+
+    dix: don't call CloseDevice on VCP/VCK separately.
+
+commit e4fd981b48723b77a6c1a528638a771b9cc35472
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 07:52:11 2007 +0930
+
+    dix: check for isMaster before calling DeviceCursorCleanup.
+
+commit 7503d1340726e0a529f04304d177ed2ceb8fbc91
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 07:50:13 2007 +0930
+
+    dix: don't check VCK and VCP separately when looking for device ids.
+    
+    Both are part of the device list again, so we cover them there.
+
+commit 032e906711202d376af95b37bb0cdf14a3648256
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 11:57:42 2007 +0930
+
+    dix: Remove GetPairedPointer, GetPairedKeyboard in favour of GetPairedDevice.
+
 commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Oct 15 22:13:02 2007 -0400
@@ -8186,6 +22849,14 @@ Date:   Mon Oct 15 22:09:47 2007 -0400
 
     registry: Register MIT-SCREEN-SAVER extension protocol names.
 
+commit 3e07e73fefc100e491d1e465cb162373d1d82425
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 11:34:29 2007 +0930
+
+    dix: remove pairing/attachment from InitAndStartDevices.
+    
+    If we enabled in the correct order, this has all been done already.
+
 commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Oct 15 22:04:20 2007 -0400
@@ -8198,12 +22869,51 @@ Date:   Mon Oct 15 22:01:20 2007 -0400
 
     registry: Register SYNC extension protocol names.
 
+commit 38baac71bdbb8c7e882e3e39133615cfed894a6b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 04:21:42 2007 +0930
+
+    dix: Set bidirectional pairing, don't allow pairing with already paired devs.
+
+commit 70efd3d06a15093661933bda4ec21e306dece4a4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 11:30:32 2007 +0930
+
+    dix: fix up Activate/Enable/Disable device.
+    
+    Set isMaster for VCP/VCK.
+    Init sprites for master pointer devices.
+    Pair master kbds with master pointers (1:1 pairing!).
+    Attach other devices to VCP/VCK.
+
 commit b504678ba5407a6fd8d47d051305f7c3d5606dfe
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Oct 15 21:54:25 2007 -0400
 
     registry: Register APPGROUP extension protocol names.
 
+commit 204f2dc89ef662b57400b128c30c15e8cf32f323
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 04:13:06 2007 +0930
+
+    include: add "isMaster" field to DeviceIntRec.
+    
+    Set to TRUE for master devices.
+    
+    Also fixing up comment for paired field in spriteInfo, will be set
+    bidirectional from now on.
+
+commit bd7d5255ce4865b684f7d8bcf80ba9872a1af22d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 16 11:18:31 2007 +0930
+
+    dix: add AttachDevice, needed to attach a slave device to a master device.
+    
+    For now, we don't allow attaching slaves to other slaves, and we don't allow
+    pairing slaves with other slaves.
+    Pairing is for master keyboard->master pointer only.
+    Attaching is for slave device->master device only.
+
 commit 6ec35a8cf539c900b334dd6df146b394f54e3706
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Oct 15 21:46:56 2007 -0400
@@ -8222,6 +22932,24 @@ Date:   Mon Oct 15 21:38:56 2007 -0400
 
     registry: Register EVI extension protocol names.
 
+commit be1565f6b8fb09eba9941d6f7c485bf5fb25fe7a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 01:53:54 2007 +0930
+
+    dix: Set core devices to ProcessOtherEvents, set sendCore and XKB.
+    
+    Even the virtual core devices should send through ProcessOtherEvents.
+
+commit ce9bf9a19185a36ac2f7ae75acd320ab8d03d247
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Oct 14 01:50:40 2007 +0930
+
+    include: add "master" field to DeviceIntRec.
+    
+    "master" points to the device this device is attached to. Event sent by the
+    device will also be routed through the master.
+    master and spriteOwner are mutually exclusive.
+
 commit f6226d3bfe1515058e2092e8662ae87825501209
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Oct 15 21:35:12 2007 -0400
@@ -8435,7 +23163,7 @@ Date:   Sun Oct 14 14:59:12 2007 -0400
     Fix GLX byteswapping.
 
 commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8
-Merge: ccda4b6... 17ffc34...
+Merge: ccda4b6 17ffc34
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Fri Oct 12 19:28:39 2007 -0400
 
@@ -8682,14 +23410,40 @@ Date:   Tue Oct 9 15:25:16 2007 -0700
 
     FreeBSD/alpha server build requires libio (missed in modularization).
 
+commit 042e16458b751ad0fcfa1ebbdd74d7d48036b22a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 9 23:07:51 2007 +0930
+
+    dix: change a few inputInfo.keyboard over to PickKeyboard()
+
 commit 6aab6a6e2ae0ef5fdedae09cf2cdc86f382e3a8a
 Author: Dodji Seketeli <dodji@openedhand.com>
 Date:   Mon Oct 8 13:25:38 2007 +0200
 
     EXA: dude, don't validation driver hooks twice !
 
+commit d42909b23a9be64a26aa349c1d6dcd8b228bffa7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Oct 5 13:04:10 2007 +0930
+
+    dix: when disabling a device, make sure all paired devices are re-paired.
+    
+    We re-pair them with the VCP, not a real device! If we would do otherwise,
+    somebody may change our keyboard focus and thus get us typing where we don't
+    want to type.
+
+commit ff2351246da30b56a3a8f90654993c41b8eb3921
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Oct 5 12:19:03 2007 +0930
+
+    dix: When pairing, only check for access right if client is set.
+    
+    If the pairing client is not set, then the pairing is initiated internally
+    (e.g. when a new keyboard device is configured). In this case we _must_ pair
+    regardless of who is the pairing client.
+
 commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8
-Merge: ab11bad... 3549a12...
+Merge: ab11bad 3549a12
 Author: Dodji Seketeli <dodji@openedhand.com>
 Date:   Thu Oct 4 13:07:50 2007 +0200
 
@@ -8762,7 +23516,7 @@ Date:   Thu Oct 4 11:38:01 2007 +0200
     it for them completely.
 
 commit 604ebb5a6de372e6a8a96e0ee997db7929126860
-Merge: 1365aef... 4ba76a7...
+Merge: 1365aef 4ba76a7
 Author: Dodji Seketeli <dodji@openedhand.com>
 Date:   Wed Oct 3 16:13:16 2007 +0200
 
@@ -8821,6 +23575,58 @@ Date:   Wed Oct 3 13:03:34 2007 +0200
     	  Some host expose buggy validity range, so rejecting client for that
     	  is too harsh.
 
+commit ab88cb8d2e7c1410f9ed2be928b38f176b132e11
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 3 18:08:33 2007 +0930
+
+    Xext: add missing geint.h to Makefile.am (un-breaks make dist)
+
+commit 9f2b493e34e93881101f31e631901d3fe56da4f0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 27 15:35:41 2007 +0930
+
+    xkb: remove some warning comments.
+    
+    Obsolete with 340911d7243a7f1095d79b5b2dcfa81b145c2474.
+
+commit 1eebb03a3190947a8102f2ddc73766cf98d34c84
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 3 15:18:17 2007 +0930
+
+    dix: ignore passive grab if the client already has a grab on the device.
+    
+    In some cases a button press may activate a passive core grab. If the client
+    owning the passive grab already has a core grab on another device, don't
+    actually activate it. Otherwise the client gets two simultaneous passive
+    core grabs, and may never ungrab the device again (only if the other grab uses
+    GrabModeSync).
+    
+    Reproducable: fire up gnome-session, open up gnome-terminal. Click with the
+    ClientPointer onto the window decoration, then click with another pointer onto
+    an application icon in the panel. Drag the icon out, release the button and
+    voila - you just lost your second mouse.
+
+commit 0b485067823620b5dbd9ef2b3e13bd35ad5a4410
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 3 14:22:55 2007 +0930
+
+    dix: send NotifyGrab/NotifyUngrab focus events regardless of semaphore state.
+    
+    This is just papering over a problem. The whole focus system needs to be
+    revised.
+
+commit 05106ac9839102c0e4a3ce5d9d83d19abf129f8a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Oct 3 11:33:10 2007 +0930
+
+    dix: change Enter/Leave semaphore handling to accommodate for NotifyGrab.
+    
+    This is a half-assed attempt at getting rid of some enter-leave problems. When
+    a grab is activated, the events didn't get sent before, leading to interesting
+    results. This commit papers over it but doesn't actually fix it properly. The
+    whole enter/leave (focusin/out) structure needs to be ripped out and changed
+    for multiple devices.
+
 commit 1365aeff5499a051375e43a9fcbf54733ac93929
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Wed Oct 3 12:00:16 2007 +1000
@@ -8848,7 +23654,7 @@ Date:   Tue Oct 2 13:13:51 2007 -0700
     Also fix incorrect library inclusion by kdrive which broke the build.
 
 commit 439edc768eea17667846ce573c843b8377e0dfb4
-Merge: c8ccf46... 93ae6fe...
+Merge: c8ccf46 93ae6fe
 Author: Eric Anholt <eric@anholt.net>
 Date:   Tue Oct 2 12:14:04 2007 -0700
 
@@ -9508,6 +24314,12 @@ Date:   Tue Oct 2 13:11:28 2007 +0200
     	  (miPointerWarpCursor): as we are switching to a new pScreen,
     	   don't forget to update the mouse sprite context.
 
+commit f965a5f3454a95ddffb2faf9b291feff46305adf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 2 16:20:27 2007 +0930
+
+    dix: Ignore devices when deleting passive core grabs.
+
 commit dc90d500085dd74e90073be008fc514bd97b160a
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Oct 2 14:05:07 2007 +1000
@@ -9535,12 +24347,61 @@ Date:   Tue Oct 2 14:03:39 2007 +1000
     ModifyPixmapHeader is mainly required for hooking the screen pixmap which
     isn't create by normal methods
 
+commit 2b075e97ec913ebe19290181e36bb169410b820b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 2 13:28:40 2007 +0930
+
+    mi: switch core keyboard on XI events, not only on core events.
+    
+    We only get core events through the EQ in exceptional cases, so make sure we
+    actually swap the core keymap for XI events as well. Gives us back the ability
+    to have multiple keyboard layouts simultaneously.
+
 commit 31555af0005a0bc4d7ef785214696ac84681e29f
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Oct 2 13:32:57 2007 +1000
 
     exa: add a pixmap private pointer for drivers to retrieve.
 
+commit 45ec6cd1fb242363c91ad8af1fd4a27a7f02621a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 2 13:19:07 2007 +0930
+
+    xfree86: fix DGA to use the correct devices.
+    
+    DGAStealXXXEvent modified to take in device argument.
+    
+    The evdev driver only sends one valuator when only one axis changed. We need
+    to check for DGA either way (xf86PostMotionEventP), otherwise we lose purely
+    horizontal/vertical movements.
+    
+    Note that DGA does not do XI events.
+
+commit 122ae65ed90195c584a770027b4d14ef65f72492
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 2 10:50:59 2007 +0930
+
+    xfree86: xf86DGA: some cleanup to use the correct devices instead of VCP/VCK.
+
+commit 54ce7436b2579bb20728eab7c8d460b531c378af
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Oct 2 10:49:46 2007 +0930
+
+    xfree86: update all pointers when calling xf86SwitchMode
+    
+    Center the frame around the first pointer found and then update all pointers
+    on the same screen to move to the edges (if necessary).
+    
+    Note: xf86WarpCursor needs to be modified, is using deprecated
+    miPointerWarpCursor and will kill the server when called with
+    inputInfo.pointer.
+
+commit 113011221a4fcbd70bc592930b35f20d55809f1e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Oct 1 21:42:01 2007 +0930
+
+    Xi, xfree86: Remove leftovers of the XI wrapper code.
+
 commit 50551ec693f40b91652fe4814e9fe2e1f9ab6517
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Sep 28 15:04:33 2007 -0400
@@ -9566,6 +24427,48 @@ Date:   Fri Sep 28 08:02:00 2007 -0400
     Introduces new dix API to lookup a device, dixLookupDevice(), which
     replaces LookupDeviceIntRec and LookupDevice.
 
+commit a511c445debbd13e8c48146ecd2d7c97e793f788
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Sep 28 18:46:41 2007 +0930
+
+    Remove generation of core events, long live XI!
+    
+    Let the drivers only generate XI events and put those into the event queue.
+    When processing events, generate core events as needed. This fixes a number of
+    problems with XKB and the DIX in general.
+    
+    The previous approach was to put core events and XI events as separate events
+    into the event queue. When being processed, the server had no knowledge of
+    them coming from the same device state change. Anything that would then change
+    the state of the device accordingly was in danger of changing it twice,
+    leading to some funny (i.e. not funny at all) results.
+    
+    Emulating core events while processing XI events fixes this, there is only one
+    path that actually changes the device state now. Although we have to be
+    careful when replaying events from synced devices, otherwise we may lose
+    events.
+    
+    Note: XI has precedence over core for passive grabs, but core events are
+    delivered to the client first.
+    
+    This removes the wrapping added in 340911d7243a7f1095d79b5b2dcfa81b145c2474
+
+commit be466d8df808c4e4067a7963617bc3f506768f2d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 27 22:23:05 2007 +0930
+
+    dix: GetPairedKeyboard() always returns a valid keyboard (VCK if necessary).
+    
+    We need it unconditionally in a few places, and the rest checked for NULL and
+    then set it to VCK anyway. So, fixing up all callers to appreciate the defined
+    return value.
+
+commit 53434edc3d306137d019d95189ecdf0dbff75205
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 27 22:14:09 2007 +0930
+
+    dix: take paired keyboard instead of VCK (CoreProcessPointerEvents)
+
 commit 2d93e69690d2c5d4a89a795ede6423796528e5df
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Sep 27 16:47:06 2007 -0700
@@ -9667,8 +24570,24 @@ Date:   Wed Sep 26 19:42:46 2007 -0700
      "ix86Pci.c", line 204: too many struct/union initializers
      "ix86Pci.c", line 214: too many struct/union initializers
 
+commit de06a47d4ad9c845b098438d9492a5f42483a2ad
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 27 11:45:03 2007 +0930
+
+    dix: GetMaximumEventsNum() needs to return 3 + MAX_VALUATOR_EVENTS.
+    
+    Raw events can be generated for pointer events, so 2 + MVE isn't enough.
+
+commit 32d0440c7f6e604807cb14dd32349df6f22c903b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 27 11:44:03 2007 +0930
+
+    xkb: xkbHandleActions: let wrapping take care of event delivery.
+    
+    This is hopefully better than hardcodey calling CoreProcessPointerEvent.
+
 commit 27612748e0ec20f3a23839f0a12e39f598dd722c
-Merge: b614614... 3b114f2...
+Merge: b614614 3b114f2
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Sep 26 07:47:29 2007 -0400
 
@@ -9708,6 +24627,104 @@ Date:   Wed Sep 26 15:26:42 2007 +0200
     	  (ephyrDownloadFromScreen),
     	  (ephyrUploadToScreen): fix compiler warnings
 
+commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 18:04:59 2007 +0930
+
+    xkb: Unwrap properly in ProcessPointerEvent.
+    
+    Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly
+    and then call the unwrapped processInputProc. Seems to be a better idea,
+    especially since it makes stuff actually work...
+
+commit 3342b5ad47be25c6838321c0aafc28c329c308b5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 18:03:21 2007 +0930
+
+    Xi: fix the wrapper code for processInputProc wrapping.
+    
+    Followup to [1].
+    If a core grab causes the device to freeze, it overwrites the processInputProc
+    of the device. [1] would then overwrite this while unwrapping, the device
+    does not thaw anymore.
+    Changing this to only re-wrap if the processInputProc hasn't been changed
+    during the event handling.
+    
+    [1] 340911d7243a7f1095d79b5b2dcfa81b145c2474
+
+commit e2cb8515661b1f7826981931d82dee6e05529f04
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 18:01:17 2007 +0930
+
+    xfree86: pass in the XKB event processing proc instead of the XI one.
+    
+    We need to pass ProcessPointerEvent or ProcessKeyboardEvent to
+    XkbSetExtension, otherwise we lose the xkb layer.
+
+commit 27bc1a8fef2bfd3d62fb44f7c7eb0d463ed08632
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 15:24:41 2007 +0930
+
+    xkb: XkbFilterEvents: Remove unused variable compiler warning.
+
+commit bfc89c035542a10594f5f0cbde1c7e28b7d024a7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 15:23:37 2007 +0930
+
+    xkb: unify ErrorFs. Prefix all with [xkb].
+    
+    Output for XkbUseMsg intentionally skipped.
+
+commit 8b508f5d6bd0d3995294d5ff300a856754442999
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 15:19:53 2007 +0930
+
+    dix: unify ErrorFs. prepend all with [dix].
+
+commit 394f3c1dbee7270a1d930846d49278424c3072d4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 15:19:37 2007 +0930
+
+    dix: GetPointerEvents: remove unused variable compiler warning.
+
+commit 55fd50273ea67eb99a0c8a830349851931298387
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 15:15:34 2007 +0930
+
+    Xi: unify ErrorFs. Prefix all with [Xi].
+
+commit 340911d7243a7f1095d79b5b2dcfa81b145c2474
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 15:12:49 2007 +0930
+
+    Wrap core event handling through ProcessOtherEvents.
+    
+    When processing events from the EQ, _always_ call the processInputProc of the
+    matching device. For XI devices, this proc is wrapped in three layers.
+    Core event handling is wrapped by XI event handling, which is wrapped by XKB.
+    A core event now passes through XKB -> XI -> DIX.
+    
+    This gets rid of a sync'd grab problem: with the previous code, core events
+    did disappear during a sync'd device grab on account of mieqProcessInputEvents
+    calling the processInputProc of the VCP/VCK instead of the actual device. This
+    lead to the event being processed as normal instead of being enqueued for
+    later replaying.
+
+commit b2a4883bd89d406713d4f808e72721ecc1456d67
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 26 09:20:11 2007 +0930
+
+    dix: add comments to PlayReleasedEvents()
+    
+    Also stick another warning in, more changes needed for XGE if panoramix is
+    active.
+
+commit 275dc77c2972147407584323b866b8acc1654ea0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Sep 25 21:40:08 2007 +0930
+
+    dix: add comments to ComputeFreezes() and syncEvents struct.
+
 commit ae8b4f7dcf1291a2f5a0d0159f3e6089eea0578a
 Author: Tilman Sauerbeck <tilman@code-monkey.de>
 Date:   Mon Sep 24 22:06:52 2007 +0200
@@ -9741,6 +24758,71 @@ Date:   Mon Sep 24 20:23:35 2007 -0700
     where the (empty) ASCII strings were stuffed in a byte early, leading to the
     descriptor being considered a detailed timing instead.
 
+commit 5d9f6cf51becdeb1d2be9bdeec4bb5d0c4dd0e8b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 13 23:33:07 2007 +0930
+
+    dix: cosmetic change. Remove "pointer" variable, might as well use pDev.
+
+commit c4db4d1fcf7fa2ba802a208beee6b3adc83921f5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 13 23:27:07 2007 +0930
+
+    include: remove register keywords.
+
+commit 1c25c46f3d5f98be8dbf36684aad4302b220e163
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 13 23:22:27 2007 +0930
+
+    dix: fix compiler warnings about unused variables.
+
+commit 68e0c4988e359e3c9da933946bc703cf8530bdbc
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 12 20:48:48 2007 +0930
+
+    dix: fix "possible use of uninitialized variable" warning.
+    
+    The device passed through to UnrealizeCursor isn't used anyway, so setting it
+    to NULL is enough.
+
+commit b484451eab261a919fe94c0c0f56877f7571fc9e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 12 18:34:51 2007 +0930
+
+    dix: don't try to access "time" field for GenericEvents in PlayReleasedEvent.
+    
+    GenericEvents can't be parsed to keyButtonPointer, and there's no guarantee
+    that it has a time field anyway. PlayReleasedEvent needs to store the millis
+    when we know it (core events, XI event) and just re-use them for GenericEvents.
+    
+    Yes, this is a hack. But it looks like the time has zero significance anyway.
+
+commit 1c38eac442a3ab9e8469e944f382251957996c5a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 12 18:09:57 2007 +0930
+
+    dix: fix comment for DeliverDeviceEvents.
+    
+    DDE is not always called, grabbed or focused devices go through
+    Deliver{Grabbed|Focus}Event first.
+    
+    Thanks to Eamon Walsh for spotting it.
+
+commit 06188ce90d2a8146140773f9367f23404b464282
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 12 18:00:03 2007 +0930
+
+    dix: Make EnqueueEvent aware of GenericEvents.
+    
+    GenericEvents can be > sizeof(xEvents), so we need to make sure we're
+    allocating and copying enough memory for the event.
+
+commit 8840829ab93c4eb62eb58753c015da5307133fe5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 12 17:40:11 2007 +0930
+
+    dix: don't compress motion events from different devices (EventEnqueue)
+
 commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sun Sep 23 17:17:03 2007 +0300
@@ -9876,6 +24958,12 @@ Date:   Thu Sep 20 06:53:51 2007 -0400
 
     xace: add hooks + new access codes: MIT-SHM extension
 
+commit 12a18cc8903fac53c3c77b23dd8093187594a4f3
+Author: David Nolden <david.nolden.git@art-master.de>
+Date:   Fri Sep 14 22:42:19 2007 +0200
+
+    compilation-fix in debug mode
+
 commit e93cff52fed9074aa007c2e6ec6b578f69aef3cb
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Sep 19 14:48:20 2007 -0400
@@ -9920,7 +25008,7 @@ Date:   Wed Sep 19 04:46:10 2007 -0700
     hey -- you have to start somewhere. ;)
 
 commit 97c150b61bbe436453b05d3c07cd2173870aac40
-Merge: 57907e0... 547ad21...
+Merge: 57907e0 547ad21
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Sep 19 07:25:55 2007 -0400
 
@@ -10045,7 +25133,7 @@ Date:   Sat Sep 15 14:01:57 2007 +0200
     Initialize output->pendingProperties.
 
 commit b9f7aeb20015290a8acf938a11bf9272bf3527cf
-Merge: e4d11e5... 06d27f8...
+Merge: e4d11e5 06d27f8
 Author: Eric Anholt <eric@anholt.net>
 Date:   Thu Sep 13 00:15:45 2007 +0000
 
@@ -10328,6 +25416,20 @@ Date:   Tue Jul 17 17:16:51 2007 +1000
 
     EXA: Add a couple of missing exaPrepare/FinishAccess calls.
 
+commit 72b347e681f5667b68257822e7cec02ab4c9cb6d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Sep 7 14:31:19 2007 +0930
+
+    dix: Enabling devices must not overwrite existing sprites/pairing.
+    
+    EnableDevices is (amongst others )called after a VT switch. We must not create
+    a new sprite or re-pair the device, otherwise we lose the input device setup
+    that we had before the VT switch.
+    
+    This requires the devices to be in exactly the same order as before
+    the VT switch. Removing a device while on a different VT is probably a bad
+    idea.
+
 commit 57907e0943da0c3fd3bf6c128d210b544629ce72
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Sep 6 16:55:51 2007 -0400
@@ -10351,6 +25453,63 @@ Date:   Thu Sep 6 05:34:14 2007 -0700
     Creating a real DDX section for XDarwin instead of
     stuffing it into the XORG section in a half-assed manner.
 
+commit d627061b48ae06d27b37be209d67a3f4f2388dd3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 6 18:57:00 2007 +0930
+
+    xfree86: wrap keyboard devices for XKB.
+    
+    Call ProcessOtherEvents first, then for all keyboard devices let them be
+    wrapped by XKB. This way all XI events will go through XKB.
+    
+    Note that the VCK is still not wrapped, so core events will bypass XKB.
+
+commit 5ee409794ee604fcf84886f70429fc2d6b1ff4f1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 6 18:52:02 2007 +0930
+
+    dix: add XI event support to FixKeyState.
+    
+    FixKeyState needs to be able to handle XI events, otherwise we get "impossible
+    keyboard events" on server zaps and other special key combos.
+
+commit 6334d4e7be18de5f237c12a6dc20f75aa23477d0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 6 18:49:57 2007 +0930
+
+    xkb: enable XI event processing for xkb.
+    
+    XI events can now take the same processing paths as core events, and should do
+    the correct state changes etc.
+    
+    There's some cases where XKB will use KeyPress as type for an event to be
+    delivered to the client. Stuck warnings in, not sure what the correct solution
+    is yet.
+
+commit 49dbe9a757a3d7a0b9ab318242c6cc0cbd4dd1f0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 6 17:27:28 2007 +0930
+
+    dix: close virtual core devices after other devices.
+    
+    If a device is paired with the VCP, deleting the VCP before the device will
+    segfault the server when the sprite should get updated.
+
+commit 03680a384aa423ece75b658f00b96db2628c39fa
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Sep 6 15:43:47 2007 +0930
+
+    dix: don't change the device struct while processing core events.
+    
+    The device state needs to be changed while processing the XI event. Core
+    events are always processed after XI, so by then the device is already set up
+    properly. However, we now rely on DeviceButtonMotionMask to be equal to
+    ButtonMotionMask. It already is, but stick a big fat warning in so nobody
+    attempts to change it.
+    
+    This commit disables XKB for the VCK, thus essentially for all devices.
+    Temporarily anyway.
+
 commit f3f614cd01ae56d84d61b4f5c907c6edd7c8c6d3
 Author: Ben Byer <bbyer@bbyer.local>
 Date:   Wed Sep 5 20:34:00 2007 -0700
@@ -10388,7 +25547,7 @@ Date:   Wed Sep 5 17:46:23 2007 -0700
     broken uses.
 
 commit e332335241af28ef0ab66b102d0cbc4e5c73ac68
-Merge: 7381e91... accd71b...
+Merge: 7381e91 accd71b
 Author: Ben Byer <bbyer@bbyer.apple.com>
 Date:   Wed Sep 5 15:51:23 2007 -0700
 
@@ -10433,7 +25592,7 @@ Date:   Wed Sep 5 14:31:01 2007 -0700
     so it doesn't make sense to require it when building on OSX/Darwin.
 
 commit ff01e44e33fd072958fb0157dae072f1b1c88944
-Merge: 8ba8c16... 47300ed...
+Merge: 8ba8c16 47300ed
 Author: Ben Byer <bbyer@bbyer.apple.com>
 Date:   Wed Sep 5 13:56:08 2007 -0700
 
@@ -10500,6 +25659,45 @@ Date:   Wed Sep 5 04:40:03 2007 -0700
     fixed path for event_status_driver.h
     (The path currently used is deprecated on Tiger and invalid on Leopard.)
 
+commit c4fff050836feeef8390b7197f1de39af2997811
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Sep 5 16:19:45 2007 +0930
+
+    Revert "Input: Fix stuck modifiers (bug #11683)"
+    
+    This reverts commit 6b055e5d9751e3679ff98065e43225ec8a960053.
+    
+    MPX relies on the XI event being delivered before the core event. Device grabs
+    break, amongst other things. I guess stuck modifiers need to be fixed some
+    other way.
+    
+    Conflicts:
+    
+            dix/getevents.c
+
+commit bfe6b4d2d9952a80f8dbc63eec974ef894e5c226
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Sep 4 17:44:51 2007 +0930
+
+    xkb: Store the action filters per device in the XkbSrvInfoRec.
+    
+    Using a global array for action filters is bad. If two keyboard hit a modifier
+    at the same time, releaseing the first one will deactivate the filter and
+    thus the second keyboard can never release the modifier again.
+
+commit cc5c926267be099d793e6dfec17916f21c73c64d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Aug 30 15:51:22 2007 +0930
+
+    randr: RRPointerScreenConfigured needs to move all pointers.
+    
+    Previous version only moved the VCP, causing "bogus pointer events" lateron.
+    Now we run through the device list, updating each pointer separately if
+    necessary.
+    
+    Also stick a big warning into RRPointerMoved, not sure what device we need to
+    work on here.
+
 commit 136fde2c7b5ed590bc6c63d11ede31e92dc679a2
 Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
 Date:   Tue Jul 3 13:44:28 2007 -0300
@@ -10544,7 +25742,7 @@ Date:   Tue Sep 4 14:49:49 2007 -0700
     Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart.
 
 commit bf5948518763b5e21eff806a0a9abc5f7757fa10
-Merge: 4062db4... 735da3d...
+Merge: 4062db4 735da3d
 Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
 Date:   Tue Sep 4 22:40:31 2007 +0200
 
@@ -10860,7 +26058,7 @@ Date:   Tue Aug 28 09:28:25 2007 -0400
     FontRec privates.
 
 commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5
-Merge: 860a09c... 7d54399...
+Merge: 860a09c 7d54399
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Aug 28 07:25:21 2007 -0400
 
@@ -10960,7 +26158,7 @@ Date:   Fri Aug 24 16:00:31 2007 -0700
     Bump video driver ABI for pci-rework.
 
 commit 91f358336f77c0e4f577be65cca977d17298e36c
-Merge: b9a806f... 8b6b40b...
+Merge: b9a806f 8b6b40b
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Fri Aug 24 15:04:21 2007 -0700
 
@@ -11014,7 +26212,7 @@ Date:   Fri Aug 24 13:04:48 2007 +0200
     case.
 
 commit 8b6b40b7271acd81a9548f502c18f46f3b640640
-Merge: ab7a6d8... 3305d17...
+Merge: ab7a6d8 3305d17
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Thu Aug 23 18:19:17 2007 -0700
 
@@ -11087,6 +26285,15 @@ Date:   Thu Aug 23 11:27:33 2007 +0200
     
     It is completely replaced by freetype these days.
 
+commit 88a9828ef906bba973debc191e35ea669b7ec271
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Aug 23 18:02:10 2007 +0930
+
+    dix: Only check device events for possible ACLs.
+    
+    We shouldn't be able to restrict events like Expose, etc. with device based
+    ACLs. So we just ignore all non-input events when checking for permissions.
+
 commit 76bf3cd7b8c6189b6b08518cde00c8bd991bdfb7
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Thu Aug 23 16:22:03 2007 +1000
@@ -11142,7 +26349,7 @@ Date:   Wed Aug 22 16:54:29 2007 +0100
     Fix <pixman.h> include to <pixman/pixman.h>
 
 commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0
-Merge: 53941c8... 6ef4ecd...
+Merge: 53941c8 6ef4ecd
 Author: Søren Sandmann Pedersen <sandmann@redhat.com>
 Date:   Tue Aug 21 14:26:34 2007 -0400
 
@@ -11222,6 +26429,14 @@ Date:   Mon Aug 20 12:57:06 2007 +0200
     ../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
     ../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory
 
+commit 2c1431a76e7219e3bd14fd7f7888a8bc4fea0f58
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Aug 20 10:06:13 2007 +0930
+
+    dix: ProcChangeActivePointerGrab: make sure variable is initialised.
+    
+    Thanks to Ben Close for spotting it.
+
 commit 65a49f0ca198e0366175367729a101211388b16b
 Author: Blair Sadewitz <blair.sadewitz@gmail.com>
 Date:   Sun Aug 19 20:29:22 2007 +0200
@@ -11392,6 +26607,16 @@ Date:   Tue Aug 14 13:20:42 2007 -0400
 
     xace: add hooks + new access codes: core protocol property requests
 
+commit 14d0397cded699378fa3c19f4e61dbab7d3a9b2c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Aug 15 22:12:29 2007 +0930
+
+    dix: ProcUngrabKeyboard: make sure grab is initialized.
+    
+    This should fix the random segfaults with ProcUngrabKeyboard.
+    
+    Thanks to David Nolden for spotting it.
+
 commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7
 Author: Fredrik Höglund <fredrik@kde.org>
 Date:   Tue Aug 14 22:47:49 2007 +0200
@@ -11435,6 +26660,21 @@ Date:   Mon Aug 13 10:43:48 2007 -0400
     X drawable, and thus, we can't implement AIGLX damage tracking with the
     current interface.
 
+commit f367285fd5825e0adc271982a529c9904ad65c89
+Merge: b1272ee ff4bd3a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Aug 12 15:31:10 2007 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xi/exevents.c
+    	dix/devices.c
+    	dix/getevents.c
+    	include/dix.h
+    	mi/mieq.c
+
 commit 03f9da672466b9ab9a9814d784b8c44f1030587e
 Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
 Date:   Sun Aug 12 03:07:04 2007 +0200
@@ -11488,6 +26728,28 @@ Date:   Wed Aug 8 12:16:12 2007 -0700
     after RRScanOldConfig is finished running. Instead, just use the first
     output (which is the only output present with an old driver, after all).
 
+commit b1272eefd9a3e340d65c14903f337747ec82d021
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Aug 8 15:00:02 2007 +0930
+
+    Fix typo from last commit. Oh well.
+
+commit c02128532e910e813fba94983733942d30c2d5cb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Aug 8 13:10:00 2007 +0930
+
+    dix: Allow flexible devices for passive core grabs.
+    
+    A passive core grab doesn't specify the device, and is thus created with the
+    ClientPointer as device.  When this grab is activated later, don't actually
+    activate the grab on the grab device, but rather change the device to the one
+    that caused the grab to activate. Same procedure for keyboards.
+    
+    Makes core apps _A LOT_ more useable and reduces the need to set the
+    ClientPointer.
+    
+    Only applies to core grabs!
+
 commit ab3f601149e15789edfb7c9a0c33387070279582
 Author: Tiago Vignatti <tiagov@balalaika.(none)>
 Date:   Tue Aug 7 23:17:32 2007 -0300
@@ -11594,6 +26856,23 @@ Date:   Tue Aug 7 01:39:29 2007 -0300
     Now we can open a device pointer and pass its options in Xephyr's command line
     without having other pointer unused.
 
+commit b8abeaf74ee8296d4bc3164a5a253624f984a6d4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Aug 7 12:32:46 2007 +0930
+
+    dix: get the paired keyboard for a passive grab (ProcGrabButton).
+    
+    Taking the VCK is only correct if no physical device is connected, and even
+    then it's not really a good idea.
+
+commit a0b87f87fb8753955505958bf3d438eef191302d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Aug 7 10:49:33 2007 +0930
+
+    dix: check for core event to determine if grab is a core grab (CreateGrab).
+    
+    Checking for VCP/VCK is simply not a safe way to check if a grab is a core grab.
+
 commit aa3c6aaaab213200591d29ddb2921adfb87ee5b4
 Author: Søren Sandmann Pedersen <sandmann@redhat.com>
 Date:   Mon Aug 6 19:00:59 2007 -0400
@@ -11639,6 +26918,15 @@ Date:   Mon Aug 6 09:16:30 2007 -0400
     xace: drop site-policy and declare-extension-security hooks, add 2 new hooks
     for controlling access to screens and screen savers.
 
+commit 9eddede039f6cbcc323b7e3e4e841c43d3ed4f43
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jul 16 18:01:00 2007 +0930
+
+    mieqEnqueue: Don't try to update the time for GenericEvents.
+    
+    Doing so may overwrite the event's length field and cause havoc. Also check if
+    realloc'd memory did actually return valid pointer.
+
 commit e717eb82dc2e55f852919312d04f5cfc8ee55bc8
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Thu Aug 2 10:50:01 2007 +1000
@@ -11748,7 +27036,7 @@ Date:   Wed Jul 25 14:57:13 2007 -0700
     ProcRenderAddGlyphs: Convert while loops to for loops where more natural
 
 commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74
-Merge: 32c0dcc... f3955c0...
+Merge: 32c0dcc f3955c0
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Aug 2 14:27:03 2007 -0400
 
@@ -12541,6 +27829,12 @@ Date:   Tue Jul 10 14:20:55 2007 -0400
 
     Add per-monitor config file option for maximum pixel clock.
 
+commit ffdf8f3e452638e6b050fccabee465d6c0300f45
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jul 10 13:56:38 2007 +0930
+
+    DeliverEventsToWindow: ensure that genericMask has a defined value.
+
 commit 161624a5a45808fd56141dc2c64be729944f03ed
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Tue Jul 10 09:02:40 2007 +0200
@@ -12557,6 +27851,45 @@ Date:   Tue Jul 10 09:02:08 2007 +0200
     e.g. the root or composite overlay window. Use refcounting via special client
     resources to fix that.
 
+commit 583e988b9f7cfb9293144c8309023c0dd1766715
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jul 10 09:19:02 2007 +0930
+
+    Install geext.h, otherwise drivers won't build.
+
+commit 9809715afaafee9baf2aef348c1ebda7e8b3f076
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jul 9 10:42:03 2007 +0930
+
+    Change CheckMotion to ignore non-pointer events but acknowledge XI events.
+    
+    Call CheckMotion from ProcessOtherEvents() to make sure absolute XI events
+    update the sprite before an event is sent.
+
+commit 62efc3951a96648cf975302aa6651cb67b87fa64
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jul 6 17:00:20 2007 +0930
+
+    DeliverGrabbedEvent: stop segfault when gemask == NULL.
+
+commit 3312e4dd5e055b2cb445b5d5c617aa7a611eedc1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jul 6 16:41:52 2007 +0930
+
+    Call CheckMotion for all core events.
+    
+    We need to do this to update the sprites x/y coordinate before we assemble a
+    button event. Absolute devices may send a buttonEvent with valuators attached.
+    If we don't update the sprite before assembling the event, the valuators are
+    lost and the button press is delivered to the previous position of the device.
+    Doesn't have any effect on relative devices.
+
+commit c1a6841a64576b7e688e9ca0d3e0db8acf52d4ae
+Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
+Date:   Tue Jul 10 10:08:44 2007 +0930
+
+    ProcX{Change|Query}WindowAccess: change device list from char* to XID*.
+
 commit 5957aa6fdc580ccad4557eeefa0636ffad823f33
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Mon Jul 9 08:47:05 2007 +0200
@@ -12566,6 +27899,16 @@ Date:   Mon Jul 9 08:47:05 2007 +0200
     One pWin->redirectDraw test was converted incorrectly, causing incorrect
     rendering in some cases.
 
+commit 5ccc09b18244f91a06b3bea20b02a97280d1a229
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jul 6 15:43:08 2007 +0930
+
+    Use the same struct for generic event masks throughout the code.
+    Renaming those structs too.
+    
+    Previously grabs were using a different struct than windows, which was
+    reasonably stupid.
+
 commit bcb23527421578bd4c9397d4c2c19cbefa22fc59
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Thu Jul 5 15:56:25 2007 -0400
@@ -12691,6 +28034,15 @@ Date:   Tue May 29 10:08:58 2007 -0700
 
     Fix documentation of association of outputs to monitor sections in xorg.conf(5)
 
+commit c1a16bdcfe7aa907fe78f27dc606a8e5a2699952
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 27 18:08:03 2007 +0930
+
+    Add 'evfill' field to GEExtensions.
+    We need this to allow extensions to fill in extra data for an event before it
+    is sent to the client. This is probably to be used like
+    FillUpEventsFromWindow().
+
 commit 4d76075dbb618a47ff9fc15c4be2e2d34210fa8d
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Fri Jun 29 14:06:52 2007 -0400
@@ -12777,6 +28129,30 @@ Date:   Wed Jun 27 03:04:55 2007 -0300
 
     Fix kdrive XKB.
 
+commit 08779c62ba2f4cbfa47e3cf738daf8abd74b60cf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jun 27 11:16:55 2007 +0930
+
+    Reset grab->next to NULL when we're creating a grab.
+    
+    This is definitely necessary in CheckDeviceGrabAndHintWindow (thanks to Paulo
+    Zanoni for spotting it). We're resetting it everywhere else too, just to be
+    save.
+
+commit 49136d3e9fe2d065090ee90c18a49f65fb027c9f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 26 19:43:54 2007 +0930
+
+    mieqEnqueue: use modulo for queue tail wrapping.
+    
+    This was previously committed by Michael Daenzer, but was lost during a pull.
+
+commit 8396bf7c8b4eb6b8f2d1e1ef19887064c69591da
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 26 12:58:37 2007 +0930
+
+    Init genericMasks to 0, make sure list is NULL terminated.
+
 commit 9725516b4274ceaf9d6caf372c5439b4c9db2316
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Jun 22 17:05:21 2007 -0700
@@ -12791,6 +28167,12 @@ Date:   Mon Jun 25 10:51:38 2007 +0200
     
     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11340 .
 
+commit c4e850a781e3b85631cb386d24efcca2a835d4c9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jun 25 13:38:25 2007 +0930
+
+    Quickfix to stop core key events from doubling up.
+
 commit 4c601b904ee6fb01da3343ff9ef00d36f1341fcb
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Mon Jun 25 10:53:05 2007 +0930
@@ -12889,6 +28271,39 @@ Date:   Thu Jun 21 15:37:18 2007 -0400
     Remove all the config file parsing code and use the new lookup interface
     instead.
 
+commit 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jun 21 18:24:30 2007 +0930
+
+    Save processInputProc before wrapping it and restore it later, instead of
+    using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
+    process DeviceKeyEvents after the first key press.
+    
+    This should be the correct fix now.
+
+commit f6f3322fc7562dbfccaf798b05d42ea222860ba8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jun 21 18:16:21 2007 +0930
+
+    Revert "Save processInputProc before wrapping it and restore it later, instead of"
+    Mixed up source trees, this was a very bad fix.
+    
+    This reverts commit 8431f6083076cf1e701366767d8f8d32a628200f.
+
+commit 8431f6083076cf1e701366767d8f8d32a628200f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jun 21 17:00:41 2007 +0930
+
+    Save processInputProc before wrapping it and restore it later, instead of
+    using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
+    process DeviceKeyEvents after the first key press.
+
+commit 0c33dc152e372cdc8ae59d9a5696b0774bcd03b7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jun 21 15:47:48 2007 +0930
+
+    Set the detail field for DeviceKeyEvents to the keycode.
+
 commit e523859a952d49b20f3d10152cc0ef695d2c12a1
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 20 17:54:38 2007 -0700
@@ -12928,6 +28343,20 @@ Date:   Wed Jun 20 18:42:00 2007 +0200
     Also move the swappedOut check before the migration checks because migration
     can't actually occur when swapped out.
 
+commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c
+Merge: 5dee64f 2e7fef7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 19 17:20:52 2007 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	dix/devices.c
+    	hw/xfree86/common/xf86Xinput.c
+    	hw/xfree86/loader/xf86sym.c
+    	mi/mieq.c
+
 commit 40f27a2df4906d9ceb1c78f6163a62c497321535
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Tue Jun 19 09:11:16 2007 +0200
@@ -12937,8 +28366,27 @@ Date:   Tue Jun 19 09:11:16 2007 +0200
     So the modulo arithmetic actually works as intended... thanks to Peter Hutterer
     for pointing out the problem.
 
+commit 5dee64fc99f34e091abce65d47c4b6f026ab4849
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 19 11:31:22 2007 +0930
+
+    Add a few comments to ProcXGrabDevice.
+
+commit 9e257029c760883c4ea0715d4fd06476f3fe8053
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 19 11:28:07 2007 +0930
+
+    Add implicitGrab field to GrabInfoRec.
+    Is set when passive grab is implicit as result of a ButtonPress event. If this
+    is the case, we need to store the XI mask as well as the core mask to ensure
+    delivery of XI events during the grab's lifetime.
+    
+    Remove all core grabs on other devices when client issues a GrabPointer or
+    GrabKeyboard request. Let's assume that the client really only wants one
+    device to interact, so this seems like a reasonable solution.
+
 commit ab7a6d860d4a275a810a64b1ba7b13726ed10575
-Merge: e9130b8... 2e7fef7...
+Merge: e9130b8 2e7fef7
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Mon Jun 18 16:51:13 2007 -0700
 
@@ -12969,6 +28417,17 @@ Date:   Mon Jun 18 12:00:49 2007 -0400
     true, preventing unwanted behavior in the case where a device is added while
     the user is in a different VT.
 
+commit 3e894974cdd6a75683d4601f71622d1da7ec4395
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jun 15 17:16:16 2007 +0930
+
+    Only decrement buttonsDown when the button count is greater than 0.
+    Device drivers flush their buttons on device init and cause a button down
+    event to be generated. If we unconditionally decrease the buttons, we won't be
+    able to ever get a passive device grab.
+    
+    Format documentation for CheckDeviceGrabs to make it readable.
+
 commit 42c2e14b254f6f882b3e79444360ab855db43e27
 Author: Matthieu Herrb <matthieu@deville.herrb.com>
 Date:   Fri Jun 15 00:14:02 2007 +0200
@@ -12978,6 +28437,12 @@ Date:   Fri Jun 15 00:14:02 2007 +0200
     Fixes Xrender clipping rectangles when X server and client are of
     different endianness, shown by xterm 225 among others.
 
+commit 0aaf51546666f71e8d1711978bc7988ec2ecc7d9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Jun 12 16:55:26 2007 +0930
+
+    Zero deviceMask and genericMask when creating a grab via CreateGrab().
+
 commit 78179ae827bb5d19abb1340084362bc51ad5c1e5
 Author: Søren Sandmann Pedersen <sandmann@redhat.com>
 Date:   Mon Jun 11 22:46:42 2007 -0400
@@ -13003,7 +28468,7 @@ Date:   Mon Jun 11 21:25:42 2007 -0400
     Delete fbBltmmx().
 
 commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0
-Merge: 878cac7... 3f9adb1...
+Merge: 878cac7 3f9adb1
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Jun 11 15:29:11 2007 -0400
 
@@ -13265,6 +28730,19 @@ Date:   Fri Jun 1 23:55:40 2007 -0700
     Need to use minPitch in miScanLineWidth() to get the shrinked
     linePitch.
 
+commit 26b21157cf934ae387b15faa9ebb060120e6a0d6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 31 17:05:14 2007 +0930
+
+    Add a deviceMask to the GrabRec and don't interfere with passiveGrabs.
+    
+    This quickfixes event delivery problems with XI events when a grab was on.
+    deviceMask is only used when the grab was from a ButtonPress to preserve
+    potential XI event masks.
+    
+    This is not an ideal solution but it works until I have time to work on
+    PassiveGrabs.
+
 commit fa877d7ff25c4ec45288e1fea70d4f5e1baf3ef3
 Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
 Date:   Wed May 30 13:06:45 2007 +0100
@@ -13276,6 +28754,22 @@ Date:   Wed May 30 13:06:45 2007 +0100
     This fixes an issue when canGrow is TRUE and modes get dropped
     when using the virtual X/Y parameters.
 
+commit 182ab3a3d5b28daa86e6d6155e76ce759687ae6d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 30 17:44:31 2007 +0930
+
+    Fix up comments for event.c
+
+commit b5db863945fa8045995b3bf742c44e40f2650f04
+Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
+Date:   Wed May 30 16:15:15 2007 +0930
+
+    Allow value None for windows when setting ClientPointer.
+    
+    We need this for clients that need to set the ClientPointer but don't have a
+    window on display yet. If used, it will set the device as the ClientPointer
+    for the requesting client.
+
 commit 99eae8bea6724a24477375ad5b2d31cc4883cf6b
 Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
 Date:   Tue May 29 22:04:36 2007 -0400
@@ -13298,7 +28792,7 @@ Date:   Tue May 29 14:54:27 2007 -0600
     Remove wscons keyboard handling stuff that doesn't belong there anymore.
 
 commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0
-Merge: 3a6549a... 2f13b7c...
+Merge: 3a6549a 2f13b7c
 Author: Matthieu Herrb <matthieu@deville.herrb.com>
 Date:   Tue May 29 12:14:49 2007 -0600
 
@@ -13471,7 +28965,7 @@ Date:   Wed May 23 12:56:04 2007 -0400
     Add missing offsets for window coordinates - reported by Colin Harrison
 
 commit 2a4aa63a23ddd816b647b851a01865861827a7eb
-Merge: 9cee4ec... cc648e6...
+Merge: 9cee4ec cc648e6
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue May 22 14:50:26 2007 -0400
 
@@ -13543,6 +29037,23 @@ Date:   Mon May 21 20:00:25 2007 -0400
     Remove the various fast path functions from fbpict, and instead use
     pixman_image_composite().
 
+commit d0e8f474099dea40bbea555427772724ccb787d1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 21 13:06:21 2007 +0930
+
+    Change GrabDevice's parameter name back to "coreGrab".
+    Was changed during a global search/replace for
+    5c680e94938c16e04a4349715cf11796b80400db.
+    
+    Otherwise people like me introduce bugs (e.g. in
+    333bab4b235801efd2b2de5b60df5b0c44048d3e)
+
+commit 167e1773de0fb566559d4362ff929eedcdb6d055
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 21 10:45:10 2007 +0930
+
+    Remove unused include "gestr.h"
+
 commit 7e2c935920cafadbd87c351f1a3239932864fb90
 Author: Fredrik Höglund <fredrik@kde.org>
 Date:   Fri May 18 20:06:14 2007 +0200
@@ -13616,6 +29127,29 @@ Date:   Thu May 17 12:59:24 2007 -0400
     Remove excessive unrolling in fbCompositeSrc_x888x8x8888() and fix bug where
     the source alpha was used instead of 0xff.
 
+commit 0b4db74922299df785e6273fdb1bf65c38d36070
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 17 18:00:07 2007 +0930
+
+    Squish the flags into the upper bits of the mode field for EnterLeave events.
+    This way we have enough space for the detail field.
+
+commit 333bab4b235801efd2b2de5b60df5b0c44048d3e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 17 17:59:02 2007 +0930
+
+    Clean up, correct some comments.
+    Send event type down with the RawEvents.
+
+commit bc334286b060bc8d0c829b18acebadf24fbdaf19
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 17 10:36:46 2007 +0930
+
+    Init device axis with -1,-1 minimum values.
+    
+    This is needed to be able to cross to screens located east/north of the
+    current active screen.
+
 commit 546465ee6aa6584780aec6357f32d205c807ae71
 Author: Soren Sandmann Pedersen <sandmann@redhat.com>
 Date:   Wed May 16 17:42:04 2007 -0400
@@ -13673,6 +29207,42 @@ Date:   Fri May 11 11:45:37 2007 -0400
 
     Add dependency on pixman 0.9.0
 
+commit a8c56372ba8aa36bac09877c478ff53ea5358df7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 15 10:24:22 2007 +0930
+
+    Revert "Allow events to grabWindows event if the device is not grabbed."
+    
+    This reverts commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6.
+    Allowing those events can lead to race conditions.
+    
+    Conflicts:
+    
+    	dix/events.c
+
+commit 81fc6a128b64ad412064405ed45db0175398e3f0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 14 18:12:56 2007 +0930
+
+    Add ungrab support to ExtendedGrabDeviceRequest handling.
+    Polish the code a bit.
+
+commit 5c680e94938c16e04a4349715cf11796b80400db
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 14 12:34:53 2007 +0930
+
+    Remove double-grab option. We only want one grab per device.
+
+commit 4dc973f08c54294e06bc831bd2839fd3aa24ecfb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 14 10:42:03 2007 +0930
+
+    Add ExtendedGrabDevice handling.
+    Add XGE handling in DeliverGrabbedEvent.
+    
+    We can now grab something selecting XGE events, but the current code is a
+    bit messy and doesn't work too well yet.
+
 commit a277f04ab08514462b7f10b4dd92eb326af85501
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Wed May 9 22:03:12 2007 -0400
@@ -13817,6 +29387,14 @@ Date:   Tue May 1 13:41:48 2007 -0400
     This is phase one of getting the two region walkers in fbcompose.c and
     fbpict.c merged together.
 
+commit cb22bdbe678a9948eda75d464d6701a729664ef0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 3 10:05:58 2007 +0930
+
+    Add selected RamDac functions to xfree86LookupTab.
+    
+    Adding those makes drivers for s3 and tga work again.
+
 commit c1e1d6b98a6708860e5b5f6e21d8d5b1d8ce9075
 Author: Brian <brian@yutani.localnet.net>
 Date:   Wed May 2 15:55:40 2007 -0600
@@ -13850,6 +29428,87 @@ Date:   Wed May 2 11:41:11 2007 +0200
     
     Problem reported by Derek Abdine of rapid7.com. Thanks.
 
+commit c03d9a7217f9895feed8cfed3ede4752faf6187c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 2 18:16:40 2007 +0930
+
+    Cleaning up a bit.
+    
+    Register correct event in EventSwapVector.
+    Fix up event swap for GE events, register XI's swap function at GE.
+
+commit e6fd4a24ebd205013b41e44aacbbfb847709d2fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 2 17:49:20 2007 +0930
+
+    Add handling for FakeDeviceEvent request.
+    Fix a stupid bug from last commit, mask names were wrong.
+
+commit af25720598bb35d9d953ac8d9a07528289ebfb4a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 2 13:51:16 2007 +0930
+
+    Add missing files for ProcXiSelectEvent.
+    
+    Should have been a part of 5e439109292e54b5c4d1a7bc7b6ac0e42ee285f7. Oh well.
+
+commit 58c0fd29272fb6c2f193cff82fb0b0573c607eec
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 2 13:50:09 2007 +0930
+
+    Adjust EQ to support long events.
+    Add RawDeviceEvent (pointers only for now).
+    
+    This commit changes the event queue to use EventLists instead of xEvent
+    arrays. Only EQ is affected, event delivery still uses xEvent* (look for
+    comment in mieqProcessInputEvent).
+    
+    RawDeviceEvents deliver driver information to the client, without clipping or
+    acceleration.
+
+commit 0214d0b96a9b900a8cf5c7f2183add3a411441f3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 1 15:49:41 2007 +0930
+
+    Start devices after windows are initialized.
+    
+    This fixes the hotplug segfault introduced with the multihead changes and
+    cleans up the code a bit as well.
+
+commit 11d0e2109b699714055e263e8963f2c39eded28b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 1 14:16:36 2007 +0930
+
+    Correct enterleave semaphore value for root window.
+
+commit 8b42ba64e169a35df2a90528dcb0cd06be0f67a1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 1 12:12:58 2007 +0930
+
+    Send PointerKeyboardPairingChangedNotifyEvent using XGE.
+    
+    Needs updated inputproto and libXi.
+
+commit 325380adb20ec2b82e176d75599fd4bc97a3b918
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 1 11:02:05 2007 +0930
+
+    Check and re-set paired devices when initializing sprites.
+    
+    If we don't do this, a device that is paired before a sprite has been
+    initialized for the paired device will not actually get the right sprite and
+    segfault the server on focus events. Happens for the VCK.
+
+commit b043a184509cfe5c4c4691ecde1a4a065e53d575
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue May 1 09:54:33 2007 +0930
+
+    Check VCP's and VCK's ids when searching for a new device id.
+    
+    Both VCP and VCK are not in the inputInfo.devices list anymore, so we need to
+    check them separately. If we don't do this, we end up re-using ids 0 and 1,
+    causing all sorts of grief for clients.
+
 commit 873ef75b1e8c94d39670c981c4d830ab8bcc018b
 Author: Colin Guthrie <gmane@colin.guthr.ie>
 Date:   Mon Apr 30 10:33:12 2007 -0600
@@ -13857,12 +29516,26 @@ Date:   Mon Apr 30 10:33:12 2007 -0600
     fix __glXErrorCallBack() proto
 
 commit 6b33459bf5aac23c3ecc7002d091c02f327d907a
-Merge: 18252a5... 3c91a99...
+Merge: 18252a5 3c91a99
 Author: Brian <brian@yutani.localnet.net>
 Date:   Mon Apr 30 10:26:19 2007 -0600
 
     Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/xorg/xserver
 
+commit 5e439109292e54b5c4d1a7bc7b6ac0e42ee285f7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 30 12:57:42 2007 +0930
+
+    Add GenericEvent extension to Xext.
+    
+    This adds (unconditional) support for the GE extension. Anything from now on
+    that sends events in MPX will have to use the GE extension. No GE, no MPX
+    events. GE is not actually used yet from anywhere with this commit.
+    
+    You will need to update x11proto, xextproto, libX11, libXext and xcb to the
+    matching xge branches. Things will _NOT_ work without the updated protocol
+    headers and libraries.
+
 commit 3c91a993e8c752002adf85c317216e1487c20780
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Sun Apr 29 23:49:41 2007 +0200
@@ -14030,6 +29703,27 @@ Date:   Fri Apr 27 08:13:08 2007 -0400
     Make sure both halves of the dst word is set to zero when the masks
     are both 0.
 
+commit f28eea0647f007c2e2415ecc6fceef46201faad4
+Merge: 339b73e ae04f2c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 27 16:34:36 2007 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	dix/devices.c
+    	dix/events.c
+
+commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 27 13:24:27 2007 +0930
+
+    Allow events to grabWindows event if the device is not grabbed.
+    
+    This kinda makes popup windows useable if the WM doesn't set the
+    ClientPointer. Kinda.
+
 commit ae04f2cb0a068cdc1e519627bf745de0c9e4a85a
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Thu Apr 26 15:28:04 2007 -0400
@@ -14118,6 +29812,33 @@ Date:   Thu Apr 26 09:45:11 2007 -0400
     - Merge Jeff Muizelaar's bugfixes to fbCompositeSrc_8888x8x8888mmx and
       fbCompositeSrc_x888x8x8888mmx.
 
+commit cfc01115af4136b2dad8218ba6b389513a356a2e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 26 22:18:35 2007 +0930
+
+    Fix cursor rendering for multi-head.
+    
+    Before putting anything on the screen, check if the GC was made for the
+    ScreenRec we want to render to. If not, toss the GC and create a new one. This
+    is not the best solution but it does the job for now. Same thing for ARGB
+    cursors except that it's even uglier.
+    
+    Also remember the screen the cursor was rendered to and check for the right
+    screen in the BlockHandler, SourceValidate and a few others. Only remove or
+    restore the cursor if we are rendering to the same screen, otherwise we get
+    artefacts that are both funky and really annoying.
+
+commit 82f97e1c0cc15b050edc82a8f3b9a423d6cf5fe7
+Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
+Date:   Thu Apr 26 15:58:50 2007 +0930
+
+    Enable event delivery for multiple heads.
+    
+    Requires moving the spriteTrace into the DeviceIntRec and adjusting a few
+    functions to take in device argument, most notably XYToWindow().
+    
+    Cursor rendering on the second screen is busted.
+
 commit c0346e57e6d3857994f7af76060c502c2fdea294
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Apr 26 12:02:45 2007 +0930
@@ -14436,6 +30157,19 @@ Date:   Wed Apr 18 12:10:05 2007 +0930
     Change dbus 'listDevices' call to not require an argument.
     Update dbus-api documentation, plug memory leak on dbus reply error.
 
+commit d61ed6c8a2823a3532439d5cb9f355129c93f523
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 19 18:08:55 2007 +0930
+
+    Check for NULL devices in CloseDevice().
+
+commit 9c30f7422121a0443c8d612d06181e17d8af9730
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 19 12:00:24 2007 +0930
+
+    config: Return errors as negative numbers, device ids as positive numbers.
+    Update dbus-api documentation.
+
 commit 999b681cf3973af4191506e49cde06963b11a774
 Author: Eric Anholt <eric@anholt.net>
 Date:   Wed Apr 18 14:33:27 2007 -0700
@@ -14476,6 +30210,13 @@ Date:   Tue Apr 17 21:34:47 2007 -0700
     Erik Andrén
     (cherry picked from commit a63704f14a1d97b9a00fef6fa290e74e51b9732b)
 
+commit ae75afcb1b5419102c5be10b8826ceed50d2ef5d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 18 12:10:05 2007 +0930
+
+    Change dbus 'listDevices' call to not require an argument.
+    Update dbus-api documentation, plug memory leak on dbus reply error.
+
 commit 9cee4ec5e6e06d23aafb302494b082c77ade4623
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Apr 17 16:01:56 2007 -0400
@@ -14494,7 +30235,7 @@ Date:   Tue Apr 17 13:46:55 2007 -0400
     security: remove debugging code.
 
 commit 1f06d32ef58749d0f0c062193d237ee98f60e90f
-Merge: cf962a8... fc162c6...
+Merge: cf962a8 fc162c6
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Apr 17 12:10:22 2007 -0400
 
@@ -14504,6 +30245,23 @@ Date:   Tue Apr 17 12:10:22 2007 -0400
     
     	dix/privates.c
 
+commit b6aec7f6f906a18d13586d63afabf1ee4fbb11c3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 17 16:51:16 2007 +0930
+
+    Change FocusIn/Out semantics to match Enter/Leave semantics.
+
+commit 451d5464b4e8a2516b8a4598b3c4eb14656be90e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 17 11:17:04 2007 +0930
+
+    Change enter/leave semantics for events with detail Notify{Nonlinear}Virtual.
+    
+    Core enter/leave events with detail Notify{Ancestor|Inferior|Nonlinear} are
+    only sent for the first/last pointer to enter/leave. Events with detail
+    Notify{Nonlinear}Virtual are sent at all times, but not to those windows that
+    currently have one or more pointers inside their boundaries.
+
 commit fc162c6cfa06f0b012743d6d79cef45cf0166229
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Mon Apr 16 09:55:58 2007 -0700
@@ -14610,12 +30368,56 @@ Date:   Sat Apr 14 18:29:25 2007 +0300
     
     SI imports/exports were dropped from Mesa.
 
+commit ea27b09d3a973d9a4943f205b24940b8624cf405
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Apr 13 17:15:22 2007 +0930
+
+    Deliver FocusIn/FocusOut events for all devices.
+    Don't use VCK in SetInputFocus and DeliverFocusedEvent.
+
 commit 7ccebc50b98ac175fdbdfaab081bcead62e60ee3
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Fri Apr 13 13:08:44 2007 +0930
 
     Documentation for events.c.
 
+commit 2bb3c81fc1ca98c909309f3af7e9c8ca6b695657
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 12 16:35:43 2007 +0930
+
+    Use paired kbd instead of VCK for EnterLeaveEvents, sanitize variable naming.
+
+commit e7b47b1758ed20e75ee267b3a09e91bf2861f6fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 12 16:24:42 2007 +0930
+
+    Change core enter/leave semantics for multiple pointers.
+    
+    Send EnterNotify when first device enters the window, LeaveNotify when the
+    last device leaves the window. Additional devices will not cause additional
+    Enter/LeaveNotifies.
+
+commit 547d720938b3668666d60110d79b150b1e9325c6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 12 11:16:19 2007 +0930
+
+    Remove workaround for a NULL core pointer in ProcessInputEvents.
+    
+    This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
+
+commit d4dad6f84f82a4ade5005c3aa93511c1295875b8
+Merge: f1f8b56 33a5d96
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 12 11:11:03 2007 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	configure.ac
+    	dix/events.c
+    	hw/xfree86/common/xf86Xinput.c
+
 commit 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Wed Apr 11 18:28:57 2007 +0300
@@ -14799,6 +30601,41 @@ Date:   Mon Apr 9 12:28:53 2007 -0700
     dumps. Add code in the -core option processing path to set the core limit to
     the maximum value.
 
+commit f1f8b562aaaa6ec32ab0d0697f964d92d6d536a4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 9 19:31:59 2007 +0930
+
+    Alloc sprite memory in devices' devPrivates, allow undisplaying cursors.
+    
+    Improve memory usage by allocating the sprite's memory only to devices that
+    actually have a sprite and provide means to remove a device's cursor from the
+    screen (more hotplugging, yay!).
+    This commit breaks ScreenRec's ABI.
+
+commit 7cef789fa13ae53bfba6dc7b5a7928b7362b2522
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 9 18:37:48 2007 +0930
+
+    Close down virtual core devices when closing all devices.
+
+commit 6081b8c76f7d934bd4e9584a2f6d55636c5289d2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 9 18:35:47 2007 +0930
+
+    Don't explicitly init sprite for VCP, EnableDevice() will take care of that.
+
+commit 00b1d52f4103a07568dcebcdaa860b9b51f19b4d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 9 18:32:00 2007 +0930
+
+    Adding some comments to devices.c.
+
+commit aa77ffb510abe004802ab9acc6996e4c6fe3ebb2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 9 18:27:22 2007 +0930
+
+    Fix: pick new ClientPointer when device is closed.
+
 commit 4beeab8424774ea4c3142f29b90e33f1fc7cb154
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sun Apr 8 13:39:06 2007 +0300
@@ -14823,7 +30660,7 @@ Date:   Fri Apr 6 13:38:12 2007 +0300
     GLcore: fix after moving xf86glx_util.[hc] to Mesa.
 
 commit cf962a849db2b259ca558c6265ea7e3328a4d312
-Merge: 5ad5625... 5a804f2...
+Merge: 5ad5625 5a804f2
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Apr 5 14:41:39 2007 -0400
 
@@ -14866,6 +30703,12 @@ Date:   Thu Apr 5 12:12:58 2007 -0400
 
     devPrivates rework: minor fix; use calloc and avoid initialization.
 
+commit 5c4deb71a1cb981ea7e2e25d2b3a1179f27efa5a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 5 14:21:46 2007 +0930
+
+    Synthesize WarpPointer events for the actual device rather than the VCP.
+
 commit ed75b056511ccb429c48c6c55d14dc7ae79e75a3
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Apr 4 12:00:15 2007 -0400
@@ -14890,6 +30733,18 @@ Date:   Wed Apr 4 12:28:48 2007 +0200
     "offscreen" in exa terms, which means accessible to the GPU.
     Bump exa minor. The change is backwards-compatible.
 
+commit 7f36ba57062096e9c67889d5b7dd64e2fb0004e7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 4 17:38:10 2007 +0930
+
+    Allow for multiple animated cursors.
+
+commit 676188531b2bd7679ee1831b5c517df3e6d215c5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Apr 4 17:35:06 2007 +0930
+
+    Unrealize cursor only once, not per device.
+
 commit c10df5b967d4da4e11786520317e2917de5541fa
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Tue Apr 3 15:47:01 2007 -0700
@@ -14951,7 +30806,7 @@ Date:   Tue Apr 3 09:27:57 2007 -0600
     about setting the XFree86Server symbol.
 
 commit 1cc8db72816cd079f30255046e10043c350bf683
-Merge: 645d87c... a39f297...
+Merge: 645d87c a39f297
 Author: Matthieu Herrb <matthieu@roadrock.(none)>
 Date:   Tue Apr 3 16:04:45 2007 +0200
 
@@ -14963,6 +30818,33 @@ Date:   Tue Apr 3 15:47:18 2007 +0200
 
     CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
 
+commit 207f710d16337839c2427aa16fad70a49834153e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 3 19:02:14 2007 +0930
+
+    Delete all grabs from all devices when deleting a window.
+
+commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3
+Merge: 9b0b340 f09ee16
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 3 15:07:18 2007 +0930
+
+    Merge branch 'master' into mpx
+
+commit f09ee168e234d0a9416e15f2916726b975cad293
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 3 15:07:00 2007 +0930
+
+    Revert "o fix minor error in comment for GetPointerEvents()"
+    
+    This reverts commit 96ce17aa94413c4b8bcb61cae71167050130a307.
+
+commit 9b0b3406682b5a3161e6c3895771523214c37207
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 3 15:06:26 2007 +0930
+
+    Make GrabDevice differ between core grabs and device grabs.
+
 commit a39f297ada4fa87c858395ae2aacefac5f8fba05
 Author: Keith Packard <keithp@viola.jf.intel.com>
 Date:   Mon Apr 2 14:15:36 2007 -0700
@@ -15062,6 +30944,36 @@ Date:   Mon Apr 2 12:26:27 2007 -0600
 
     formatting fixes
 
+commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0
+Merge: a120547 96ce17a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 2 15:36:26 2007 +0930
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	Xi/closedev.c
+    	Xi/exevents.c
+    	Xi/extinit.c
+    	Xi/listdev.c
+    	dix/window.c
+    	hw/xfree86/common/xf86Xinput.c
+    	include/extinit.h
+    	mi/mipointer.c
+
+commit 96ce17aa94413c4b8bcb61cae71167050130a307
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 15 17:50:02 2006 +1030
+
+    o fix minor error in comment for GetPointerEvents()
+
+commit a12054757d21edacc1c24c3077b9214726652829
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 2 11:20:44 2007 +0930
+
+    Xi:     fix ProcXListInputDevices to include the virtual core devices.
+
 commit f2808005f4ee72c5fd7f5f3dcca181306485113e
 Author: Alberto Mardegan <mardy@users.sourceforge.net>
 Date:   Sat Mar 31 16:51:24 2007 +0200
@@ -15098,7 +31010,7 @@ Date:   Fri Mar 30 16:05:46 2007 -0600
     values of 1280 (my screen width).
 
 commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48
-Merge: 2c6d471... 92e8cdb...
+Merge: 2c6d471 92e8cdb
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Fri Mar 30 13:39:15 2007 -0700
 
@@ -15172,12 +31084,41 @@ Date:   Thu Nov 30 04:20:32 2006 +0200
     
     Depends on mesa commit 7439a36785b6a2783e80a40a96c09db8f56dc2bc of 2007-03-30.
 
+commit 63d8f01819ef44ea3bf0d4fb20ba1d698ae91cd2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Mar 30 14:59:43 2007 +0930
+
+    dix:    Fix wrong cursor refcount.
+    
+            Calloc cursor struct to ensure devPrivates are zeroed out and don't
+            increase the refcnt for devices automatically when allocating a new
+            cursor. Use new DeviceIsPointerType() to detect if device is a pointer
+            _before_ device has been activated and can thus be identified and set
+            up grab functions accordingly. This way we can increase the refcnt
+            when we get a pointer grab.
+
+commit 20e4314b178e1a093bce85e93329d4bcfb4f4210
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 29 19:12:32 2007 +0930
+
+    dix:    Try to get closer to the correct refcnt for cursors.
+    
+            This commit introduces a memory leak, as the refcnt never seems to get
+            down to 0 and thus cursors will not be freed. Solves the problems with
+            GNOME segfaulting every 30 seconds though.
+
 commit 307d2b57bbfcc281656011533627bea6ab98189e
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Mar 29 15:23:41 2007 +0930
 
     Xi:     remove 'register' keywords.
 
+commit 0c607f4b1902f993597e09ea7a2c83bc1cca9b96
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 29 14:43:50 2007 +0930
+
+    dix:    Pick keyboard instead of using virtual keyboard in Grab/UngrabKey.
+
 commit 82a8b99a6c46018885600011913267d8af9dfe13
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Wed Mar 28 15:17:02 2007 -0400
@@ -15206,7 +31147,7 @@ Date:   Wed Mar 28 12:57:11 2007 -0400
     xace: provide creation-time resource hook call in CreateWindow().
 
 commit 99b220969f2f8ba829bc8294b27ca90fd9311be4
-Merge: 728ad64... 82a8b99...
+Merge: 728ad64 82a8b99
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Mar 28 12:54:04 2007 -0400
 
@@ -15219,7 +31160,7 @@ Date:   Wed Mar 28 12:03:19 2007 -0400
     Refuse to create tiny modes from EDID detailed timing.
 
 commit 2c6d47108880584f1221ff86c6c8947627f9f607
-Merge: c4fe1bc... 8522044...
+Merge: c4fe1bc 8522044
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Wed Mar 28 08:08:04 2007 -0700
 
@@ -15289,7 +31230,7 @@ Date:   Mon Mar 26 16:04:50 2007 -0700
     Fix indentation of fakexa help text.
 
 commit 728ad64d979fd9e5cca28e8c15118c18d707c431
-Merge: 0331c6a... 6a0bed1...
+Merge: 0331c6a 6a0bed1
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Mar 27 13:16:40 2007 -0400
 
@@ -15326,7 +31267,7 @@ Date:   Mon Mar 26 12:44:58 2007 -0700
     Update xorg.conf manpage for new RandR 1.2 monitor options.
 
 commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413
-Merge: 84a066c... f7c5aa0...
+Merge: 84a066c f7c5aa0
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Mar 26 10:28:05 2007 -0400
 
@@ -15404,6 +31345,20 @@ Date:   Sun Mar 25 09:41:33 2007 +0930
 
     dix: Increase allocation size for core keyboard keymap to avoid buffer overrun when copying keymap from extension devices.
 
+commit 5f9c10e8da0d9d96cc00a38cdf9a8c3030063e03
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Mar 25 15:00:03 2007 +0930
+
+    Clean up DeviceIntPtr, prepare for Server 1.4 ABI. Move sprite-related
+    information into a new SpriteInfoRec, remove isMPDev flag.
+
+commit e54311395e1e7ae458c8ce59da0914706c4a04f6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Mar 25 09:41:33 2007 +0930
+
+    dix:    Increase allocation size for core keyboard keymap to avoid buffer
+            overrun when copying keymap from extension devices.
+
 commit 1072b88a8f352484e70bc749e300c936e5600480
 Author: Dave Airlie <airlied@linux.ie>
 Date:   Sun Mar 25 10:06:00 2007 +1000
@@ -15546,6 +31501,15 @@ Date:   Thu Mar 22 10:59:21 2007 -0400
 
     dix: devPrivates support for PropertyRec.
 
+commit f8cd19bd1692d12a6047c088a626a6ae715d469d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 22 17:47:01 2007 +1030
+
+    Xi:     add GetClientPointer and GetPointerPairing requests.
+    
+    dix:    use PickKeyboard for ProcSetInputFocus and ProcGetInputFocus instead
+            of the core keyboard.
+
 commit a3296d111dc4d76aa3afa7e338cbab93eb390ec4
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Mar 21 17:01:26 2007 -0400
@@ -15652,6 +31616,34 @@ Date:   Mon Mar 19 16:51:29 2007 -0400
 
     xselinux + security: remove confusing CALLBACK macro.
 
+commit 0acf993e2878d0866fd4e2db8252c1ea6841e494
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Mar 19 16:11:01 2007 +1030
+
+    dix:    Move sprite initalization/pairing from ActivateDevice to
+            EnableDevice.
+            zero out spriteTrace, otherwise GetCurrentRootWindow() may return
+            invalid data.
+    
+            Evdev adds previously hotplugged devices on its own when rescanning,
+            and ActivateDevice does not get called for those devices. Sprites need
+            to be initialized or paired before the device gets started, so the
+            safest place to do so is EnableDevice (which actually does get called
+            by the evdev driver).
+
+commit 015d728bcde5b16a72a976579755421e3023626b
+Merge: 65b0eb6 b167583
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Mar 19 09:42:56 2007 +1030
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	dix/devices.c
+    	dix/events.c
+    	mi/misprite.c
+
 commit 720f302d241e88e6e9f2962207da1aa9a79728b7
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Sat Mar 17 20:14:05 2007 -0700
@@ -15722,6 +31714,24 @@ Date:   Sun Feb 18 23:49:38 2007 -0800
     
     Updated code to work in master with recent security API changes.
 
+commit b167583fe234a536aa6187e17f21da85be4f0b7f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 15 17:50:02 2006 +1030
+
+    o fix minor error in comment for GetPointerEvents()
+
+commit 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Mar 16 15:52:24 2007 +1030
+
+    Xi:     move IsPointerDevice into dix.
+    dix:    IsPointerDevice and IsKeyboardDevice, use same ways to identify type
+            of device as XI does for the XListInputDevices reply.
+            Autopair each non-pointer device with VCP when activating, pair with
+            real device after activation.
+            Don't return non-keyboard devices when calling GetPairedKeyboard or
+            PickKeyboard, otherwise we segfault for 'evdev brain'.
+
 commit 3bffb281260476d2f74f0bf451d85d2f7cacd6c4
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Thu Mar 15 16:16:16 2007 -0700
@@ -15756,6 +31766,13 @@ Date:   Thu Mar 15 16:56:01 2007 +0100
 
     Fix calculations in x86 emulator for the long long case (Andreas Schwab).
 
+commit 456f429ad655ab4d80e30c58291d801966a613b2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 15 21:48:19 2007 +1030
+
+    dix:    fix: don't return when device is same as argument.
+            fix: set access default rule to 0 on init.
+
 commit ae75019ccf1edac9e8be31b6a96293624f672ccb
 Author: Keith Packard <keithp@guitar.keithp.com>
 Date:   Wed Mar 14 23:59:29 2007 -0700
@@ -15770,6 +31787,28 @@ Date:   Wed Mar 14 23:59:29 2007 -0700
     needed hooks to the crtc funcs structure for your driver.
     (cherry picked from commit 4d81c99a4660a0bf9014f789de55edabd185bd14)
 
+commit c5b07fb717289f61b54d7b093421bcb92124b839
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Mar 14 17:42:30 2007 +1030
+
+    kdrive: update kdrive to new mi API with additional device argument. Includes
+            an update of ati_cursor.c and i810_cursor.c
+
+commit c3eb248cf93a3afd9168acfb88254606beddd7a8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Mar 14 13:21:33 2007 +1030
+
+    dix:    fix: don't skip first item in list when seeking for a device cursor.
+
+commit ce9409acebd994cf1809050f2cc8e1db66130f12
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Mar 13 19:16:56 2007 +1030
+
+    dix:    Get the state from the paired device and the real device to fill the
+            state field in the event, rather than using the virtual devices.
+            ProcessPointerEvent: name argument "device" instead of "other".
+            Add GetPairedKeyboard().
+
 commit 4bf1b280f7cb676ec2b172f26dd2ad9bac2eb2ca
 Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
 Date:   Fri Mar 9 14:18:14 2007 +0000
@@ -15782,6 +31821,21 @@ Date:   Fri Mar 9 12:26:55 2007 +0000
 
     Ensure domain is stripped from the bus ID.
 
+commit 577464af4362e5a32cf7165b5128655dd86c6200
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Mar 9 17:13:05 2007 +1030
+
+    dix:    restore commit b3b2a6a0d43d1724e04d69588f8a55c3270e5523 that for some
+            reason got wiped.
+            fix ProcGrabKeyboard to use PickKeyboard
+            fix PickKeyboard to actually work.
+
+commit 07806f4081f8dcd3b5733b590eb6e5b4cae734ad
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Mar 9 15:45:25 2007 +1030
+
+    Xi:     Add SetClientPointer request handling.
+
 commit 405483496538f1c82cbd7fe1e76c5d94e1a90525
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Fri Mar 9 14:16:23 2007 +1030
@@ -15827,12 +31881,34 @@ Date:   Wed Mar 7 11:22:42 2007 -0500
     devPrivates rework: hook up new mechanism in backwards-compatibility mode
     on existing structures that support devPrivates.
 
+commit b3b2a6a0d43d1724e04d69588f8a55c3270e5523
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 8 22:16:17 2007 +1030
+
+    dix:    Check if client has a grab on any other device before mouse/kbd
+            event is delivered to the client. Client's don't cope well with
+            receiving core events from other devices when having a grab on a
+            pointer or keyboard.
+
 commit 63169ce52d354b4345dcfc46b89f0ea88379718f
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Mar 8 17:50:19 2007 +1030
 
     dix: remove 'register' keyword for all variables.
 
+commit ceca5670fee99b5feceaa2453f1ac32d1bfe7dcd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 8 17:17:23 2007 +1030
+
+    dix:    Each device needs to differ between a core grab and an XI grab,
+            otherwise a Xi grab may overwrite or release a core grab.
+            Replace grab and associates with coreGrab and deviceGrab structures,
+            adjust rest of dix/Xi/etc to compile.
+    
+    xfree86: Don't check for core devices, we'll have the virtual ones anyway.
+             If we check, the first mouse device is duplicated and sends
+             double events.
+
 commit 40ae4f246d8818410490236ab183204a84765629
 Author: Keith Packard <keithp@guitar.keithp.com>
 Date:   Wed Mar 7 20:52:31 2007 -0800
@@ -15863,12 +31939,30 @@ Date:   Wed Mar 7 09:57:02 2007 -0500
     devPrivates rework: move reset functions into a single call.
 
 commit bb111291d854b4329e47367ce3c67e8a2785e6e9
-Merge: 74175e0... e9bfb2b...
+Merge: 74175e0 e9bfb2b
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Mar 7 09:03:46 2007 -0500
 
     Merge branch 'master' into XACE-SELINUX
 
+commit 537bc2ead4d154552cbdc3a19e335f82af63792c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Mar 7 18:19:20 2007 +1030
+
+    Xi:    Don't deactivate core grabs from non-core button/key releases.
+    
+    dix:    set coreGrab flag for grabs caused by GrabPointer and button presses.
+            remove virtual core devices from device list, only real devices are in
+            the list now.
+            Auto-pair each keyboard with a real pointer if one is available,
+              provides multiple keyboards automatically after startup if devices
+              are configured.
+            fix GuessFreePointerDevice() to do what it's supposed to do.
+    
+    mi:     fix: call miPointerMove from miPointerWarpCursor.
+            fix: remove unused id field from miCursorInfoRec
+            don't update sprite for virtual core pointer.
+
 commit e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Tue Mar 6 23:19:30 2007 -0800
@@ -15917,7 +32011,7 @@ Date:   Tue Mar 6 11:09:30 2007 -0800
     updated todo list
 
 commit 81d581e655fc989da3be4256b83849a63b8607b7
-Merge: a05ffca... d5aba03...
+Merge: a05ffca d5aba03
 Author: Ben Byer <bbyer@bbyer.(none)>
 Date:   Tue Mar 6 10:37:29 2007 -0800
 
@@ -15948,7 +32042,7 @@ Date:   Tue Mar 6 02:31:59 2007 -0800
     moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it
 
 commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e
-Merge: ec1ef8a... 9b6bb06...
+Merge: ec1ef8a 9b6bb06
 Author: Ben Byer <bbyer@bbyer.(none)>
 Date:   Tue Mar 6 01:04:50 2007 -0800
 
@@ -16023,7 +32117,7 @@ Date:   Mon Mar 5 12:34:37 2007 -0500
     devPrivates rework: remove some debugging code from dixFreePrivates.
 
 commit 23fc429aad5b2721911862617772c314e1036bb0
-Merge: e684824... fe7b8f4...
+Merge: e684824 fe7b8f4
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Mar 5 12:18:54 2007 -0500
 
@@ -16047,6 +32141,15 @@ Date:   Mon Mar 5 02:30:56 2007 -0800
 
     started moving new input code into darwinEvents.c so that it may be shared by the three servers
 
+commit 39aa79177196e21bcdbaf8e44adead9ef91e6ee5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Mar 5 15:31:16 2007 +1030
+
+    dix:    Add GuessFreePointerDevice(). Runs through device list and tries to
+            find a pointer that hasn't been paired yet.
+    
+    xfree86:  Use GuessFreePointerDevice() for newly connected non-sprite devices.
+
 commit 8ba5e8d82014b774a52f3e050ddbbb8bde4e0933
 Author: Dave Airlie <airlied@linux.ie>
 Date:   Mon Mar 5 13:46:41 2007 +1100
@@ -16059,6 +32162,21 @@ Date:   Mon Feb 26 09:40:00 2007 +1100
 
     modes: add commit/prepare hooks
 
+commit 1f0075786fedde538a95e2f39681052e25021d88
+Merge: 57aa5e9 12175b6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Mar 5 12:37:17 2007 +1030
+
+    Merge branch 'master' into mpx
+    
+    Conflicts:
+    
+    	configure.ac
+    	dix/getevents.c
+    	hw/xfree86/ramdac/xf86Cursor.c
+    	mi/mipointer.c
+    	xkb/xkbUtils.c
+
 commit 06b01186f6ae17aafdd1f628c306466ddea9e065
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Sun Mar 4 17:15:24 2007 -0800
@@ -16116,6 +32234,12 @@ Date:   Sat Mar 3 19:27:53 2007 -0800
 
     autoconf fixes for XDarwin (created DARWIN_LIBS)
 
+commit 12175b668a94e23994f724b366a691ec312cce69
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 15 17:50:02 2006 +1030
+
+    o fix minor error in comment for GetPointerEvents()
+
 commit ea1a72946d1aa4c256e6afb9d834c582ba4ac3a1
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Wed Feb 28 14:26:47 2007 -0800
@@ -16148,6 +32272,24 @@ Date:   Fri Mar 2 12:30:26 2007 +0100
 
     Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled.
 
+commit 57aa5e908dc11d5d8c27ed705c526f1416c1e8ad
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Mar 2 17:14:37 2007 +1030
+
+    dix, Xext, Xtrap, Xi: replace inputInfo.pointer with PickPointer where
+                          possible. More replacements to come.
+
+commit e43b8a4e40991ca6e545bda4cf9b9bd7a2bf22e2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Mar 2 15:21:46 2007 +1030
+
+    dix:    Add ClientPointer to client, used for picking which pointer to use in
+            ambiguious request. PickPointer and PickKeyboard are used for getting
+            the appropriate pointer when situation is unclear.
+            Fix some issues with InitializeSprite.
+    
+    dix, xfree86: Remove last traces of InitSprite.
+
 commit 2dafc46e3d814e02b25e5a2fa2e931f0257402a8
 Author: Ben Byer <bbyer@bbyer.apple.com>
 Date:   Thu Mar 1 17:44:39 2007 -0800
@@ -16175,6 +32317,19 @@ Date:   Thu Mar 1 00:51:10 2007 -0800
     AIGLX support for Darwin -- works well enough to run
     glxgears and glxinfo, but still needs more testing.
 
+commit 43bd35fcf85b51b7e5714844bade90184dbd746f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Mar 1 17:19:37 2007 +1030
+
+    dix:    Remove InitSprite, work can be done by InitializeSprite.
+            Free sprite struct if a spriteOwner is paired.
+    
+    xfree86: Use PairDevices instead of passing booleans around when creating a
+             sprite.
+    
+    Xext:    Switch back to using LookupPointer/KeyboardDevice instead of
+             inputInfo.xyz.
+
 commit 90ca76ba28fcd8bed945e33cf9674784fa2eb533
 Author: Jay Cotton <jay.cotton@sun.com>
 Date:   Wed Feb 28 17:40:58 2007 -0800
@@ -16201,8 +32356,15 @@ Date:   Mon Feb 26 17:45:40 2007 -0800
 
     Return BadMatch if a client tries to clone non-cloneable outputs.
 
+commit 2a35d44b6d87f96a7ce90dc8f0142f48cc176e95
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Feb 28 15:43:06 2007 +1030
+
+    Update device valuators on XTest motion event, otherwise the cursor jumps
+    between coordinates stored in device and coordinates sent by the event.
+
 commit d9bcb22d199e8444b9762a35754e04d327dd5915
-Merge: 272d934... c16343a...
+Merge: 272d934 c16343a
 Author: Ben Byer <bbyer@bbyer.apple.com>
 Date:   Tue Feb 27 16:28:20 2007 -0800
 
@@ -16293,6 +32455,13 @@ Date:   Fri Feb 23 13:19:53 2007 -0500
 
     devPrivates rework: add dix header file containing new interface.
 
+commit bc4ae25433e38a25a2012f9f233d500665172a4b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Feb 23 12:06:51 2007 +1030
+
+    xfree86: Don't initialize sprites for devices that don't own a sprite (stops
+             keyboard hotplug segfaults)
+
 commit af550ea91c451cf4f831c2413266a19d1f211d0e
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Feb 22 14:38:40 2007 -0800
@@ -16311,6 +32480,14 @@ Date:   Thu Feb 22 12:26:04 2007 -0800
     Bugzilla #10034: <http://bugs.freedesktop.org/show_bug.cgi?id=10034>
     Patch #8780: <http://bugs.freedesktop.org/attachment.cgi?id=8780>
 
+commit 4b8b0e377a27ec904b2028c89aed11c6416af26c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 22 20:00:59 2007 +1030
+
+    Xi: 	Add access control request handling.
+    
+    dix:	New file access.c to handle all access control for devices.
+
 commit 9a3eb0357e779d5d5f76858f23667956c4c5d721
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Feb 16 19:30:03 2007 -0500
@@ -16318,6 +32495,13 @@ Date:   Fri Feb 16 19:30:03 2007 -0500
     devPrivates rework: add RC_PRIVATES class, make ResourceRec visible in
     the API, and add extra fields and structure supporting private storage.
 
+commit cd0af7a7856e8246e27acc5513d219a094211625
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Feb 21 10:08:41 2007 +1030
+
+    Xi, dix: Only one client at a time can change the pointer-keyboard pairing,
+             using xRegisterPairingClient request.
+
 commit 3344a4eda704edc7dc30037f095de277a60a70bb
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Thu Feb 15 16:27:50 2007 +0100
@@ -16605,14 +32789,14 @@ Date:   Thu Feb 15 17:07:42 2007 +0200
     http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
 
 commit f452507ca9209598401d15da0039aaa4e1fed1a3
-Merge: 0463283... 8116757...
+Merge: 0463283 8116757
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Feb 15 09:47:20 2007 -0500
 
     Merge branch 'master' into my-XACE-SELINUX
 
 commit 04632835b7402456fdcf6c8fa01970cd2804e27c
-Merge: 88f89b9... 9ecf79c...
+Merge: 88f89b9 9ecf79c
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Feb 15 09:27:05 2007 -0500
 
@@ -16646,6 +32830,13 @@ Date:   Thu Feb 15 05:09:29 2007 -0800
     
     This is the automake framework for the XDarwin.app interface files.
 
+commit f6c3b9fa97ccf85e96f15435d564a1c261e40532
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Feb 15 13:51:20 2007 +1030
+
+    xfree86: mouse and keyboard hotplugging support. New mouse devices will get
+             new cursors,  keyboard devices use VCP's focus until paired.
+
 commit d570ff7c81858a3174686b46a088f67563b4a2d5
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Wed Feb 14 17:09:33 2007 +1030
@@ -16653,7 +32844,7 @@ Date:   Wed Feb 14 17:09:33 2007 +1030
     fix: WarpCursor needs to send MotionNotify.
 
 commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a
-Merge: e540d57... d570ff7...
+Merge: e540d57 d570ff7
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Wed Feb 14 15:39:52 2007 -0800
 
@@ -16683,6 +32874,21 @@ Date:   Tue Feb 13 18:32:59 2007 -0800
 
     Update Xvfb man page: remove monolith build instructions, use /var/tmp instead of /usr/tmp
 
+commit 25104ed2e6050f86691104b34eeaf3147eb83c4a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Feb 14 11:26:53 2007 +1030
+
+    dix:    fix typo in condition.
+
+commit 33ef546b942977bb2573156eaba5269350d16f99
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Feb 14 11:18:43 2007 +1030
+
+    dix:    Clean up GetPointerEvents. If pDev == inputInfo.pointer, assume that
+            we do not want Xi events.
+    
+    mi:     Remove POINTER_CORE_ONLY flag.
+
 commit a23b0b069cac8a48e2b306b2095515d75f647705
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Mon Feb 12 17:50:00 2007 -0500
@@ -16702,7 +32908,7 @@ Date:   Mon Feb 12 17:18:29 2007 -0500
     Remove spurious LIBADD from xf4bpp
 
 commit 16eb7254f861465f988ae3861ac3449c2c966062
-Merge: 3814862... c4b7e9d...
+Merge: 3814862 c4b7e9d
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Fri Feb 9 12:38:49 2007 -0800
 
@@ -16758,6 +32964,14 @@ Date:   Tue Feb 6 16:43:37 2007 -0500
     Marco Gritti <mpg at redhat dot com>
     Jordan Crouse <jordan dot crouse at amd dot com>
 
+commit 7cd73b00a29469d37a7f526cc9b35cc927a13ae2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 5 14:48:48 2007 +1030
+
+    dix:    If POINTER_CORE_ONLY is set, GetPointerEvents() only creates a core event
+    
+    mi:	fix: Create motion event in miPointerMoved
+
 commit 760a38c4c7ab66ae653d3acb92f5cda4bd44edd6
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Mon Feb 5 03:39:36 2007 +0200
@@ -16777,6 +32991,14 @@ Date:   Thu Jan 18 15:23:57 2007 +1100
     Don't always define XFree86Server, but only for damn fbcmap.c.
     Split fbcmap.c into its own library to achieve this.
 
+commit a309c936bb79e2fea04a96ce33c7da99ed902484
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Feb 5 11:38:44 2007 +1030
+
+    xkb:	Daniel's patch to stop evdev keyboard segfaults.
+    
+    mi:	Remove quickfix from ba547d4f6a2707f51f0d826389d2d418fb62367a
+
 commit 236f04b638e7d4d1656c6bedd8a6e8d7cec285ec
 Author: Dave Airlie <airlied@linux.ie>
 Date:   Mon Feb 5 09:09:12 2007 +1100
@@ -16865,7 +33087,7 @@ Date:   Mon Jan 29 17:30:59 2007 -0800
     Typical results were failure to sync, and a black screen.
 
 commit 3814862a869ee83d307eb01225d5949039f435d8
-Merge: a216de9... 31f2d4a...
+Merge: a216de9 31f2d4a
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Mon Jan 29 15:14:31 2007 -0800
 
@@ -16888,6 +33110,43 @@ Date:   Mon Jan 29 09:39:33 2007 -0800
     
     Reviewed by: ajax
 
+commit 4aaaa70d1b52346213fad46777c006a93c4ece5d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 29 18:23:24 2007 +1030
+
+    Xi:	Adding ChangePointerKeyboardPairing request
+    	Adding PointerKeyboardPairingChanged event
+    	Correct error values for XWarpDevicePointer
+    
+    dix:	Adding device argument to SendMappingNotify
+    	Adding spriteOwner flag to devices
+
+commit f3418b52dcf2ab4982504856ab9fae3e726ee6d2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 29 16:10:03 2007 +1030
+
+    mi:     Fix cursor rendering issues.
+
+commit 15a81b6325d359990017b8e9f17ce18a7eff1354
+Merge: 3759254 cc3d66d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jan 28 17:18:57 2007 +1030
+
+    Merge branch 'master'
+
+commit cc3d66d4a53fee8f1d940bb8c7f032c94b9c25f6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 15 17:50:02 2006 +1030
+
+    o fix minor error in comment for GetPointerEvents()
+
+commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9
+Merge: ba547d4 ca5ebe3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Jan 28 17:05:55 2007 +1030
+
+    Merge branch 'master'
+
 commit 1627af54497bee659ea30f2850b39cbbf576e22d
 Author: Jonathan Lim <jlim@sgi.com>
 Date:   Fri Jan 26 13:00:45 2007 +0100
@@ -16901,7 +33160,7 @@ Date:   Fri Jan 26 13:00:45 2007 +0100
     Xorg #9692
 
 commit a216de9b7ff55e2b73c487d037f248f00bd2e63b
-Merge: 24506ea... cf7ca9d...
+Merge: 24506ea cf7ca9d
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Thu Jan 25 10:17:32 2007 -0800
 
@@ -16936,7 +33195,7 @@ Date:   Wed Jan 24 15:33:49 2007 -0800
     read_legcay_BIOS, and delete all remnants of it from all other places.
 
 commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b
-Merge: 39b51e1... a53586e...
+Merge: 39b51e1 a53586e
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Wed Jan 24 14:49:39 2007 -0800
 
@@ -16964,7 +33223,7 @@ Date:   Thu Jan 25 00:29:20 2007 +0800
     Make Xinearama screen information reflect CRTC rotation.
 
 commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa
-Merge: 637b19b... 788cfce...
+Merge: 637b19b 788cfce
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Tue Jan 23 13:25:56 2007 -0800
 
@@ -17006,7 +33265,7 @@ Date:   Mon Jan 22 09:13:59 2007 -0800
     ARCH_PCI_OS_INIT mechanism useless.  Remove it.
 
 commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f
-Merge: c279d5f... 2dc8662...
+Merge: c279d5f 2dc8662
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Mon Jan 22 08:44:36 2007 -0800
 
@@ -17044,7 +33303,7 @@ Date:   Fri Jan 19 14:52:23 2007 -0800
         -ardelay and -arinterval, respectively.
 
 commit c279d5fdc53612a90f33fafe9e9c59ced008dd51
-Merge: 88f248e... 14d6a9b...
+Merge: 88f248e 14d6a9b
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Fri Jan 19 12:59:54 2007 -0800
 
@@ -17291,6 +33550,21 @@ Date:   Thu Jan 11 21:09:20 2007 -0800
     This allows the conversion of xf86ReadLegacyVideoBIOS and
     xf86MapDomainMemory to 'struct pci_device' from PCITAG.
 
+commit ba547d4f6a2707f51f0d826389d2d418fb62367a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Jan 12 14:42:02 2007 +1030
+
+    mi:     Quick fix to stop segfault on non-core keyboards.
+
+commit 5e2f8dee6331645fcbd2734c43698eb4f9c5b116
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Jan 11 14:05:39 2007 +1030
+
+    mi:	remove core pointer special handling. No event has core pointer as
+    	device now.
+    
+    dix:    zero pSprite memory, stop segfaults on server restart.
+
 commit 7fccec91c46baac4f8d2965180dc535b4eb7d65c
 Author: Eric Anholt <eric@anholt.net>
 Date:   Wed Jan 10 13:10:43 2007 -0800
@@ -17307,6 +33581,14 @@ Date:   Wed Jan 10 16:04:20 2007 +0000
 
     lnx_ev56.c has to be built with -mcpu=ev56. Fix it.
 
+commit ea82333dc1799a7e013205adbc89874bc8d273cb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Jan 10 14:52:13 2007 +1030
+
+    Xi:     add missing call for SProcXChangeDeviceCursor
+    	add DeviceEnterNotify and DeviceLeaveNotify
+    	fix: QueryDevicePointer crashed if called with keyboard device
+
 commit 6a2fb2928714ce77ee342cdc23a1178e5e766cf2
 Author: Eric Anholt <eric@anholt.net>
 Date:   Tue Jan 9 16:34:40 2007 -0800
@@ -17314,7 +33596,7 @@ Date:   Tue Jan 9 16:34:40 2007 -0800
     Track rename of DamagePost -> DamageAdd.
 
 commit da09964a931cc64d05ab571bf545fdad35a6d395
-Merge: e1f73d2... e3aa6ad...
+Merge: e1f73d2 e3aa6ad
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Tue Jan 9 15:27:34 2007 -0800
 
@@ -17357,6 +33639,18 @@ Date:   Mon Jan 8 19:22:41 2007 +0100
     Not sure this is 100% correct either, but it fixes at least one reproducible
     crasher where it returned a pixmap to dixLookupWindow().
 
+commit a7ab7932938820a795bb6fb8e0444e0824433b99
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 8 17:31:16 2007 +1030
+
+    xfree86:  fix XI86_SHARED_POINTER flag setting
+
+commit 95e1a88050dde61e9b2407428042a43e47b46e18
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Jan 8 12:31:18 2007 +1030
+
+    Xi:     Adding ChangeDeviceCursor request
+
 commit 0b73a7eb17fd848c6bdc6a65ba835aa2cbfc3cfd
 Author: Eric Anholt <eric@anholt.net>
 Date:   Fri Jan 5 18:12:04 2007 -0800
@@ -17387,7 +33681,7 @@ Date:   Thu Jan 4 15:37:33 2007 -0800
     Incorporate new byte-order related configure changes.
 
 commit 8dd5771a1b91c331860b667fb18e484452000aad
-Merge: 45aa26c... 7d2ec92...
+Merge: 45aa26c 7d2ec92
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Thu Jan 4 15:01:38 2007 -0800
 
@@ -17553,7 +33847,7 @@ Date:   Thu Dec 28 13:15:11 2006 -0800
     Export exaMove{In,Out}Pixmap().
 
 commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b
-Merge: 05f9150... 9563b2e...
+Merge: 05f9150 9563b2e
 Author: Eric Anholt <eric@anholt.net>
 Date:   Wed Dec 27 16:11:31 2006 -0800
 
@@ -17594,7 +33888,7 @@ Date:   Sat Dec 9 22:51:59 2006 +0200
     Make sure we're not copying sym_interpret across from an empty source.
 
 commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a
-Merge: 4b1c9ac... d9e079d...
+Merge: 4b1c9ac d9e079d
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Dec 22 13:53:55 2006 -0500
 
@@ -17619,6 +33913,36 @@ Date:   Wed Dec 20 13:45:24 2006 -0500
     Naming change: Security*Access -> Dix*Access.
     Clarify some error message strings.
 
+commit 9fd2f167ec02ee170b87f02ddca89eba0b2e2389
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Dec 20 16:30:36 2006 +1030
+
+    xfree86: fix xf86ProcessCommonOptions() core and shared pointer assignment
+    
+    TAG: mpx-0.3.0
+
+commit 056c919d849a78c8d507bfcecfa74c0b0165751a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Dec 20 14:49:17 2006 +1030
+
+    removing MPX extension files
+
+commit b55e1239ac3b2962a33d8af1f911cc0f01f40f23
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Dec 20 14:43:38 2006 +1030
+
+    xfree86:  fix xf86ActivateDevice(): only set to MP device if not a keyboard
+
+commit 202b46eb6bf0d5f94973c2bf1e4ebe9d154eadbf
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Dec 20 13:05:53 2006 +1030
+
+    xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default
+    	 to MP devices.
+    
+    Xi:	Adding QueryDevicePointer request/reply
+    	Adding WarpDevicePointer request/reply
+
 commit e437f357b6850a6c87ca6696870b3abd40e5b8ed
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Dec 19 16:38:34 2006 -0800
@@ -17626,7 +33950,7 @@ Date:   Tue Dec 19 16:38:34 2006 -0800
     xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
 
 commit a81dbaae0597492f0245080c6f5af7158e05e2d0
-Merge: fb6d676... d442998...
+Merge: fb6d676 d442998
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Dec 19 16:11:19 2006 -0500
 
@@ -17666,7 +33990,7 @@ Date:   Tue Dec 19 18:45:25 2006 +0100
     This affects drivers with no UploadToScreen or UploadToScreen failures.
 
 commit 4334860e69e7d5b156082bd05c7a86708e5bad4c
-Merge: 7e47176... fdcc22c...
+Merge: 7e47176 fdcc22c
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Tue Dec 19 16:29:26 2006 +0100
 
@@ -17700,6 +34024,20 @@ Date:   Tue Dec 19 15:24:19 2006 +0100
     
     See https://bugs.freedesktop.org/show_bug.cgi?id=6772 .
 
+commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba
+Merge: 4d07b50 1b029fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 19 10:51:01 2006 +1030
+
+    Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
+
+commit 2d0a63126b3d3a17005b7e122617ee0c5f44a55b
+Merge: d8b5394 1b029fd
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 19 10:31:40 2006 +1030
+
+    Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
+
 commit 1b029fd896b76096905c516925ce0214fe14632c
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Dec 18 14:51:04 2006 -0800
@@ -17714,6 +34052,31 @@ Date:   Mon Dec 18 14:51:04 2006 -0800
     - Converted (1) to (__appmansuffix__) in a few more places
     - Replaced http://www.freedesktop.org/cvs/ with http://gitweb.freedesktop.org/
 
+commit d8b5394eda9d92b7193004931caa6c24a337b2e6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Dec 18 17:35:34 2006 +1030
+
+    Cleaning up ifdef MPX from remaining files, removing it from configure.ac.
+    Removing building mpx extension from Makefile.am
+
+commit 03c554283e49e449fd1282cf32564d15d9fd2c77
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Dec 18 15:33:54 2006 +1030
+
+    mi:     removing MPX ifdefs
+    	global sprite renaming in mipointer and misprite
+    	fixed: multiple remove cursor call in miSpriteInstallColormap
+    	fixed: wrong core pointer usage in miSpriteStoreColors
+    
+    dix:    bugfix in CheckCursorConfinement
+    	removing MPX ifdefs
+    	removing MPX event generation (using Xi solely now)
+    	bugfix GrabDevice: uninitialized field in grab struct caused segfault
+    
+    xfree86: removing MPX fdefs
+    
+    Xi:     removing MPX protocol events
+
 commit a5fcf1e5e7452c9be82f63b6c2be2a25c4109523
 Author: James Steven Supancic III <arrummzen@arrummzen.net>
 Date:   Sat Dec 16 12:02:38 2006 -0500
@@ -17856,6 +34219,19 @@ Date:   Thu Dec 14 14:45:42 2006 -0500
 
     Naming change: Security*Access -> Dix*Access
 
+commit a96788058e48f3e97c66da6dafd58828f0c2ce53
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Dec 14 10:50:18 2006 +1030
+
+    mi:     removing MPX ifdefs
+    	global sprite renaming in mipointer and misprite
+    	fixed: multiple remove cursor call in miSpriteInstallColormap
+    	fixed: wrong core pointer usage in miSpriteStoreColors
+    
+    dix:    bugfix in CheckCursorConfinement
+    	removing MPX ifdefs
+    	removing MPX event generation (using Xi solely now)
+
 commit b88ad820fac81d0dfd557a384bf0406e8893e7af
 Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
 Date:   Wed Dec 13 12:13:11 2006 +0000
@@ -17883,7 +34259,7 @@ Date:   Tue Dec 12 15:59:08 2006 -0500
     Split AssignClientState() into two routines, new routine is server-specific.
 
 commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6
-Merge: e124806... f3c6090...
+Merge: e124806 f3c6090
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Dec 12 13:54:33 2006 -0500
 
@@ -17970,6 +34346,16 @@ Date:   Mon Dec 11 14:50:08 2006 +0000
     
     Bug #3678 (Colin Harrison)
 
+commit ae3c24da34cd8eeb77a6389861856fd51e0841f5
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Dec 11 18:09:59 2006 +1030
+
+    dix:    Moving SpriteRec into DeviceIntRec
+    	removing global sprite structure
+    	beginning to remove MPX ifdefs
+    
+    xnest:  Fix to make xnest compile again
+
 commit fb8364bca30fe9268e807b0a9a3ebf875ee1fce2
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Sun Dec 10 11:24:05 2006 -0500
@@ -17977,7 +34363,7 @@ Date:   Sun Dec 10 11:24:05 2006 -0500
     Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible.
 
 commit e1f73d220873fa091695e46b7fcd008663a95a6f
-Merge: 27d682f... d56249a...
+Merge: 27d682f d56249a
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Fri Dec 8 17:24:15 2006 -0800
 
@@ -17997,7 +34383,7 @@ Date:   Fri Dec 8 17:24:15 2006 -0800
     	hw/xfree86/utils/scanpci/Makefile.am
 
 commit d56249a15ead51ad4d2117d5538ada24af05b693
-Merge: f1f8df1... ec84f72...
+Merge: f1f8df1 ec84f72
 Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
 Date:   Fri Dec 8 15:52:37 2006 -0600
 
@@ -18152,6 +34538,33 @@ Date:   Tue Dec 5 12:42:12 2006 -0800
     Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
     if !pWin->realized.
 
+commit eb1d9f51af19dab20a95c2830ca1c508d8ee66bb
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 5 18:50:19 2006 +1030
+
+    Ironing some glitches caused by the merge
+
+commit 3c8f166022a2d19af14eb670fa382503ba1451cd
+Merge: 2a51149 f9f7d7f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 5 18:28:33 2006 +1030
+
+    Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
+    
+    Conflicts:
+    
+    	dix/events.c
+
+commit 2a511492f9a235d3f5390ab87b6c643cbea92d88
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Dec 5 15:45:18 2006 +1030
+
+    Xi:     adding MPX checks to ProcessOtherEvents
+    
+    mpx:    adding QueryPointer request and reply
+    	adjusting names of requests to Xlib compatible naming (xMPX*** instead of
+    	mpx***)
+
 commit f9f7d7f3be53c808abb5eaceb7a1abc55744a210
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Dec 4 13:36:30 2006 -0800
@@ -18199,8 +34612,21 @@ Date:   Thu Nov 30 23:16:42 2006 -0800
     Final RandR 1.2 spec uses 16-bit nAtoms field instead.
     (cherry picked from 66b6358a393972946f16394918db2401c51dc5ed commit)
 
+commit 416f1bb99a6d4557f2863ae941868e47e11bbb3b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Dec 1 15:56:52 2006 +1030
+
+    mpx:    SelectEvents and GetEventBase requests.
+    	Some renaming and cleaning up in extinit.c
+    	MPXLastEvent added
+    
+    Xi:	ShouldFreeInputMask() from XI is not static any more, used in mpx
+    
+    dix:	GetPointerEvents() allocates MPX event for MPX devices.
+    	DeliverDeviceEvents() caters for MPX devices.
+
 commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0
-Merge: 9423ac1... 82912ad...
+Merge: 9423ac1 82912ad
 Author: Drew Parsons <drew@pug.localdomain>
 Date:   Fri Dec 1 15:21:57 2006 +1100
 
@@ -18239,7 +34665,7 @@ Date:   Wed Nov 29 22:19:57 2006 -0500
     Add required root window context to config file.
 
 commit 143558500a89a5c887c75c03798bae68c953cac9
-Merge: e3d3d29... ee9bdd3...
+Merge: e3d3d29 ee9bdd3
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Nov 29 20:41:41 2006 -0500
 
@@ -18266,6 +34692,12 @@ Date:   Wed Nov 29 19:25:09 2006 +0100
     This allows video drivers to clean up in the FreeScreen hook things they set up
     in the PreInit hook.
 
+commit afd6af65510b0147f16f08314045b3506bfa9d89
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 29 17:55:15 2006 +1030
+
+    mpx:    Infrastructure for MPX extension, GetExtensionVersion request works.
+
 commit b0c8558b9d9a9984c0067960392e28f5a7622b29
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Sun Nov 26 19:31:48 2006 -0800
@@ -18338,6 +34770,22 @@ Date:   Tue Nov 28 18:57:13 2006 +0100
     
     https://bugzilla.novell.com/show_bug.cgi?id=223718
 
+commit bdf718907b3202815a04ec28a868689708f43da9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 28 18:06:34 2006 +1030
+
+    dix:	missing parameter to SetCursorPosition in CheckMotion ifndef MPX
+    
+    mi:	missing include in misprite.c ifndef MPX
+
+commit e88bc0e55a6937ff0b47fe38f60bfa8991196578
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 28 14:34:36 2006 +1030
+
+    mi:     Bugfix: FreeCursor ignores negative refcounts.
+    
+    mieq:   Bugfix: Motion notifies did overwrite DeviceMotionNotifies
+
 commit 5dbcd34a0a6c0d10dbfea8fdc9d7dfe7a0261b19
 Author: Eric Anholt <eric@anholt.net>
 Date:   Mon Nov 27 16:26:14 2006 -0800
@@ -18351,7 +34799,7 @@ Date:   Mon Nov 27 16:21:31 2006 -0800
     Move mode handling helpers from ddcProperty.c to xf86Mode.c.
 
 commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618
-Merge: 64de3ba... d6cd031...
+Merge: 64de3ba d6cd031
 Author: Eric Anholt <eric@anholt.net>
 Date:   Mon Nov 27 15:43:15 2006 -0800
 
@@ -18376,6 +34824,55 @@ Date:   Mon Nov 27 14:46:50 2006 -0800
     to at least the intel driver, but perhaps others that were doing mode list
     handling.
 
+commit 85ea408e38f452bcf9109f14fd1016d159692a99
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 27 18:07:16 2006 +1030
+
+    mi:     malloc checks for misprite and midispcur, code cleanup
+    	removed IsMPDev()
+
+commit 023da4e804ad260eaf0c50d2ec7213dd514e2113
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 27 15:54:33 2006 +1030
+
+    mi:     mipointer.c cleanup, reducing code duplication, using MPHasCursor()
+    	instead of IsMPDev()
+
+commit a2340a73687dfd93affb6de28a33d73fd808c96b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 27 14:47:23 2006 +1030
+
+    mi:     free allocated memory in miDCCloseScreen and in miDCInitialize in case
+    	of errors.
+    	Some copyright notices.
+    	misprite.c passes DeviceIntPtr around and down to DC (previously
+    	miCursorInfoPtr and the plain device id).
+    	Large cleanup in misprite.c to avoid code duplication.
+
+commit 1c7568b8a1417257fa67c7fca69aa253099b9461
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 23 17:15:14 2006 +1030
+
+    mi:	closing memory leak, miPointer is freed in miPointerCloseScreen
+    	bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
+    	adding DeviceIntPtr parameter to ScreenRec's cursor functions.
+    	cleanup of miPointer code to use same scheme in each function
+    
+    dix:	MPHasCursor() function determines checking whether to invoke
+    	cursor rendering.
+    
+    animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
+    	 on the core pointer right now.
+    
+    xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
+    	the core pointer right now.
+    
+    rac:	adding DeviceIntPtr parameter to cursor functions but RAC relies on
+    	the core pointer right now.
+    
+    ramdac:	adding DeviceIntPtr parameter to cursor functions but ramdac relies on
+    	the core pointer right now.
+
 commit 64de3baf85f6df274f71f736016f0848567cd9f6
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Wed Nov 22 14:46:51 2006 -0800
@@ -18407,6 +34904,36 @@ Date:   Wed Nov 22 09:16:17 2006 -0700
 
     Regenerated from Mesa, fixes glMap* protocol problem (bug 8899)
 
+commit f52d53e060d0468b658a565688d1f92c156405c7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 22 17:58:57 2006 +1030
+
+    dix:	DeliverEventsToWindow adjusted for MPX
+    
+    mi:     sprite debugging disabled
+
+commit 8c16f21d5df08b028e93440d632939a5fdbf5876
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 22 17:06:47 2006 +1030
+
+    dix	GetSpriteWindow() adjusted for MPX
+    	added device dependency for MPX to DoEnterLeaveEvents,
+    	EnterLeaveEvents, EnterNotifies, LeaveNotifies and
+    	FixUpEventFromWindow.
+
+commit 70383105de279df553874efa56b37a7b3e426ea1
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 22 15:27:16 2006 +1030
+
+    mi:     added DevToSprite() conversion function
+            fixed miSpriteRealize to use passed pDev argument instead of looping.
+    
+    dix:    changed sprite dependency and added MPX functionality to parts of
+            events.c (XineramaChangeToCursor, XineramaCheckPhysLimits,
+            XineramaConstrainCursor)
+    
+    Xi:	fix: accessing other->buttons for keyboard segfaulted the server
+
 commit 33ff4cec5ff7533ec725f71d357c096dfb0acb79
 Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
 Date:   Tue Nov 21 21:23:17 2006 +0000
@@ -18415,8 +34942,83 @@ Date:   Tue Nov 21 21:23:17 2006 +0000
     
     This ensures that all calls to FatalError() will shutdown the input devices.
 
+commit efd4f3c6ffec804c68ba5df17cc117da264fb7c4
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 21 20:31:30 2006 +1030
+
+    dix:	WindowsRestructured() calls CheckMotion() on all devices
+    
+    mi:	core pointer was checked twice in miSpriteReportDamage,
+    	miSpriteInstallColormap, miSpriteStoreColors, miSpriteSaveDoomedAreas
+    	and miSpriteRealiseCursor
+    	using damage bug (see comment in file) to avoid artefacts
+
+commit 9db851c22d4befb95bfb074b96620261d8e32ac9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 21 18:15:04 2006 +1030
+
+    dix:    moved sprite from static to be pointer of type SpritePtr
+    	added SpriteRecs for MPX devices
+    	changed sprite dependency and added MPX functionality to parts
+    	of events.c (ConfineToShape, PostNewCursor, XineramaCheckMotion,
+    	CheckMotion, XineramaChangeToCursor, ChangeToCursor, CheckPhysLimits,
+    	PointerConfinedToScreen)
+    	added DeviceIntRec param to GetSpritePosition(). This required some
+    	minor changes in ddx, xtest, xkb and xfixes.
+    
+    mi:	changed miPointer to pointer instead of static struct.
+
+commit fd8b9a6eaee28a453a00af14195b81ef1890a577
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 21 15:24:43 2006 +1030
+
+    TAG:   MPX_BEFORE_DIX_API_BREAK
+
+commit 447efdc01d4f8922205ba26e52c9e5ff9f5cb90e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 21 14:46:00 2006 +1030
+
+    mi:	constrain MPX cursors to screen
+
+commit 1107d8bea22eea26f7b666f1c00a53360b7d237e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 21 14:00:46 2006 +1030
+
+    mi:     added device ID to miSpriteCursorFuncRec functions
+            added MPX code to midispcur.c
+    
+    BUG:   Core pointer changes whenever MPX cursor changes shape.
+
+commit 3bad452d12d620df91b1f37d06c650ded96bfafe
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Nov 21 11:26:21 2006 +1030
+
+    mi:     added MPX to miSpriteReportDamage
+            added id field to miCursorInfoPtr, required to pass through to miDC
+            core pointer uses mpCursors array as well.
+            added miDCBufferRec for future use with MPX
+    
+    TAG: MPX_BEFORE_MIDC_API_BREAK
+
+commit b1bbdf464d2f8799fa3429c1c27ca998c5f3e94a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 20 17:58:30 2006 +1030
+
+    mi:     added MPX to miSprite functions.
+    
+    NOTE: This version will render multiple cursors but with an artefact each time
+    when devices alternate.
+
+commit 7b4b619d4c268804199f9f4775eb56604f0b80e8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Nov 20 13:10:07 2006 +1030
+
+    mi:     moved core pointer information from miSpriteScreenRec into a
+            miCursorInfoRec.
+            bugfix in mipointer, semicolon after preprocessor statement
+
 commit ca2874b273232d9f51881b1cd754ed6847bfaf47
-Merge: c9a5f9d... e2f6dac...
+Merge: c9a5f9d e2f6dac
 Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
 Date:   Sat Nov 18 19:56:32 2006 +0000
 
@@ -18438,6 +35040,40 @@ Date:   Sat Nov 18 11:26:55 2006 +1100
     
     This is due to radeon doing drm stuff before DRI extension gets initialised
 
+commit 90bea69dfdd63f58ee326887359ad1b35a31cb5f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 17 18:03:43 2006 +1030
+
+    mi:
+            added miCursorInfoRec to contain info of the MPX cursors.
+            calling miUpdatePointerSprite() from event queue for MPX devices.
+            adding device-specific processing to miPointer*() functions.
+    
+    dix:    Call to SetCursorPosition in CheckMotion() temporarily disabled.
+    
+    xfree86/common: call to miPointerUpdateSprite() disabled, is done from the EQ
+    
+    NOTE: This build will not display cursor images.
+    BUG: The second mouse does to take correct x coordinates.
+
+commit 94e106a898c44daeb228bcb031b85f996ddc96b0
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Fri Nov 17 15:10:37 2006 +1030
+
+    dix:    moved isMPdev field to end of _DeviceIntRec structure
+    
+    mi:
+            added miMPPointers array to mipointer.c
+            added DeviceIntPtr to all miPointerSpriteFuncs. Coming from miPointer
+            we use inputInfo.pointer as standard value. ABI BREAK!
+    
+    ramdac:
+            forcing failed HW Cursor initialisation. MPX needs software rendering.
+            changes to use new miPointerSpriteFunc (this required externing
+            inputInfo, should probably be fixed at a later point).
+    
+    RAC: changes to use new miPointerSpriteFuncs.
+
 commit ef47d9c3ba63e9a6243fe5c81ccc60c8246352b4
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Thu Nov 16 13:50:48 2006 -0800
@@ -18472,6 +35108,52 @@ Date:   Thu Nov 16 17:29:06 2006 +0100
 
     Bug 9041: Check the return code in xf86MapDomainMemory().
 
+commit 5388423eb05daefcc71067b6ab96b6e57c44ef5c
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 16 20:43:27 2006 +1030
+
+    mieq:  EQ processing handles MP devices
+    
+    global: MPX define added to xorg-server.h.in
+    
+    xfree86/common: small fix to avoid byte overflow
+
+commit c957a16180810fbd58526e1a670d82384fb4a61d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 16 15:11:14 2006 +1030
+
+    dix:    added isMPdev field to _DeviceIntRec, is used in GetPointerEvents()
+    
+    mieq:   avoid merging events from different devices in mieqEnqueue()
+    
+    xfree86/common
+            isMPdev field used from xf86ActivateDevice(), xf86PostMotionEvent()
+            and xf86PostButtonEvent()
+
+commit 7ce2dc57844872cc340b60387d4d1cb3d982633e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 16 12:51:08 2006 +1030
+
+    dix:
+            merge with code cleanup from master
+            GetPointerEvents treats events in the same way as XINPUT devices when flag
+            has POINTER_MULTIPOINTER set.
+    
+    xfree86/common:
+        added XI86_MP_DEVICE flag and parsing in xf86ProcessCommonOptions
+        added POINTER_MULTIPOINTER define. Is used in xf86PostMotionEvent and
+        xf86PostButtonEvent for the flags that are passed into GetPointerEvents()
+    
+    global:
+        added flags to configure.ac to enable/disable MPX define
+        added flags to dix-config.h.in to define MPX
+
+commit 4d07b503727ba86315b90d6f45b06ed6185724b2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Nov 16 10:55:15 2006 +1030
+
+    dix: cleaned up GetPointerEvents() to avoid code duplication.
+
 commit 6ff7f2ad6a5e2e769244590578e6809974b5235d
 Author: Eric Anholt <eric@anholt.net>
 Date:   Tue Nov 7 13:13:53 2006 -0800
@@ -18479,6 +35161,18 @@ Date:   Tue Nov 7 13:13:53 2006 -0800
     Fix build on FreeBSD after input-hotplug.
     (cherry picked from commit 4e6e4baead6c565363abbcd9e06cc685be121596)
 
+commit bffb1f9b67c8d3d264c0c3fd703cf7e57dcdf7b7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 15 17:53:13 2006 +1030
+
+    removed unused variables drag and local from xf86PostMotionEvent
+
+commit f737cd925efe452787443b039ae65b8d85081bb3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed Nov 15 17:50:02 2006 +1030
+
+    o fix minor error in comment for GetPointerEvents()
+
 commit 2eab230d9bd3f73ffe1b5a42111f89e85904ee11
 Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
 Date:   Tue Nov 14 16:37:18 2006 -0600
@@ -18497,7 +35191,7 @@ Date:   Tue Nov 14 15:33:07 2006 +0100
     Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.
 
 commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf
-Merge: 6facd95... f80a8ae...
+Merge: 6facd95 f80a8ae
 Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
 Date:   Mon Nov 13 20:32:26 2006 -0600
 
@@ -18821,7 +35515,7 @@ Date:   Tue Nov 7 15:48:05 2006 -0800
     A couple more cases of error message before freeing strings.
 
 commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58
-Merge: 3e7e0e3... 46af6d1...
+Merge: 3e7e0e3 46af6d1
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Tue Nov 7 18:42:54 2006 -0500
 
@@ -18867,7 +35561,7 @@ Date:   Tue Nov 7 01:29:51 2006 -0800
     getevents.c
 
 commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8
-Merge: 028bbdc... 3d39c02...
+Merge: 028bbdc 3d39c02
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Tue Nov 7 01:21:28 2006 -0800
 
@@ -18906,14 +35600,14 @@ Date:   Mon Nov 6 00:30:09 2006 +0100
     Fix typo in Xvesa: incorrect reporting of DAC capabilities.
 
 commit 028bbdc0417173803695808ba9f48498519273a3
-Merge: 50504c6... 8deaaa3...
+Merge: 50504c6 8deaaa3
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Sat Nov 4 17:46:26 2006 -0800
 
     Merge master back to randr-1.2
 
 commit 50504c68e1d407232cf83465981b235e542ef31f
-Merge: 8b87ce1... cde8806...
+Merge: 8b87ce1 cde8806
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Sat Nov 4 17:43:19 2006 -0800
 
@@ -18993,7 +35687,7 @@ Date:   Fri Oct 27 12:36:56 2006 -0700
     and 1024x768@75 modes.
 
 commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4
-Merge: 49a2668... bd0c829...
+Merge: 49a2668 bd0c829
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Nov 3 12:54:56 2006 -0800
 
@@ -19106,7 +35800,7 @@ Date:   Thu Nov 2 12:25:03 2006 +0100
     Build with -D_PC on ix86 only.
 
 commit 543b397277d1f03b8091e44812010abcd5d80102
-Merge: 4056e6e... 645d057...
+Merge: 4056e6e 645d057
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Thu Nov 2 19:00:35 2006 -0800
 
@@ -19177,14 +35871,14 @@ Date:   Thu Nov 2 03:22:09 2006 +0200
     bump to 1.2.99.0
 
 commit 18c246a13b887b865de6a17e6cd1c259b9bc383d
-Merge: 794f2e7... 4843d82...
+Merge: 794f2e7 4843d82
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Nov 2 03:21:37 2006 +0200
 
     Merge branch 'input-hotplug'
 
 commit 4843d823f4d38d8bd468ce3a8feddbff229ed416
-Merge: ba9f513... a7b944f...
+Merge: ba9f513 a7b944f
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Nov 2 03:18:13 2006 +0200
 
@@ -19200,7 +35894,7 @@ Date:   Thu Nov 2 03:16:10 2006 +0200
     config file.
 
 commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9
-Merge: a2d6242... 6fdfd9d...
+Merge: a2d6242 6fdfd9d
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Nov 2 03:15:25 2006 +0200
 
@@ -19317,7 +36011,7 @@ Date:   Sun Oct 29 17:49:46 2006 +0100
     kill GNU-make'ism.
 
 commit 0107320fac0913aae2cb169992e31c670b4bd2f7
-Merge: 06b6b97... a34446f...
+Merge: 06b6b97 a34446f
 Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
 Date:   Sun Oct 29 15:23:35 2006 +0100
 
@@ -19388,7 +36082,7 @@ Date:   Fri Oct 27 18:26:30 2006 +0200
     Import libdrm functions for the drm memory manager.
 
 commit e3d3d29db5eef057b4e8294377c9c3147436bc2f
-Merge: 92387e9... 004d00e...
+Merge: 92387e9 004d00e
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Oct 26 20:21:16 2006 -0400
 
@@ -19439,7 +36133,7 @@ Date:   Thu Oct 26 20:38:58 2006 +0300
     lnx_ia64.c.
 
 commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e
-Merge: cdc8a4b... 004d00e...
+Merge: cdc8a4b 004d00e
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Oct 26 15:21:22 2006 +0300
 
@@ -19457,7 +36151,7 @@ Date:   Thu Oct 26 01:10:08 2006 +0300
     The fallthrough to gettimeofday() is preserved.
 
 commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a
-Merge: 3da918a... d285833...
+Merge: 3da918a d285833
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Oct 26 00:28:30 2006 +0300
 
@@ -19498,14 +36192,14 @@ Date:   Wed Oct 25 11:39:27 2006 +0200
     without pretending it's always on.
 
 commit 59511974db843fa7e11133894cfc10c20fdaf60f
-Merge: 054f8cd... 598ac7a...
+Merge: 054f8cd 598ac7a
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Tue Oct 24 17:26:20 2006 -0700
 
     Merge branch 'master' into randr-1.2
 
 commit 598ac7a83698327b607084abaebcbd22f8d25fbb
-Merge: 828c34e... 948a97b...
+Merge: 828c34e 948a97b
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Tue Oct 24 17:23:12 2006 -0700
 
@@ -19604,7 +36298,7 @@ Date:   Tue Oct 24 09:04:14 2006 -0700
     Fix from HEAD accidentally reverted during merge.
 
 commit 8b909135664abb69ada522e8e39495d9eca717ac
-Merge: 21291d6... 948a97b...
+Merge: 21291d6 948a97b
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Tue Oct 24 08:57:59 2006 -0700
 
@@ -19661,7 +36355,7 @@ Date:   Mon Oct 23 05:12:15 2006 +0300
     Remove unused xf86CheckButton.
 
 commit c5b5b046e86b159a9d32451308f38246cc4587f7
-Merge: fab1d37... 948a97b...
+Merge: fab1d37 948a97b
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Mon Oct 23 02:58:30 2006 +0300
 
@@ -19847,7 +36541,7 @@ Date:   Sat Oct 21 22:06:43 2006 +1000
     Minor typos in Xserver man page.
 
 commit e26a494f417c3c700636ee68892c3015b2e0f27a
-Merge: 736b0d5... aeba855...
+Merge: 736b0d5 aeba855
 Author: Zephaniah E. Hull <warp@agamemnon.b5>
 Date:   Sat Oct 21 04:26:14 2006 -0400
 
@@ -20161,7 +36855,7 @@ Date:   Fri Oct 13 17:34:53 2006 -0700
     Separate configuration from layout changes to send correct events.
 
 commit 335b503c5e7041bb0c44611e496d1c46f554e630
-Merge: bd3d93b... cf948b7...
+Merge: bd3d93b cf948b7
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Oct 13 18:10:45 2006 +0300
 
@@ -20175,7 +36869,7 @@ Date:   Fri Oct 13 14:48:10 2006 +0100
     to avoid cursor movements signalling io.
 
 commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6
-Merge: 23f6f08... 042d4a4...
+Merge: 23f6f08 042d4a4
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Oct 11 20:50:31 2006 -0400
 
@@ -20389,7 +37083,7 @@ Date:   Sat Oct 7 14:16:51 2006 +0300
     layer.
 
 commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db
-Merge: 8382234... 49a70c8...
+Merge: 8382234 49a70c8
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Oct 6 18:01:13 2006 -0700
 
@@ -20442,14 +37136,14 @@ Date:   Thu Oct 5 16:07:26 2006 -0400
     Improve error handling, messages during initialization.
 
 commit de63a469dcd0a8ae98554bca540ac0106cccf2a5
-Merge: 9c7440b... 8382234...
+Merge: 9c7440b 8382234
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Oct 5 20:29:19 2006 +0300
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
 
 commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b
-Merge: c4f30c6... 8382234...
+Merge: c4f30c6 8382234
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Wed Oct 4 14:46:04 2006 -0700
 
@@ -20485,7 +37179,7 @@ Date:   Tue Oct 3 17:48:50 2006 -0700
     Don't insert RCS tag into generated pci id header files
 
 commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343
-Merge: 6926776... 20c0cee...
+Merge: 6926776 20c0cee
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Oct 3 13:58:03 2006 -0400
 
@@ -20519,7 +37213,7 @@ Date:   Mon Oct 2 02:17:14 2006 +0300
     Use XkbCharToInt as that's what we're doing.
 
 commit 3c98cebb6e954855528794fec46830f456cbdec1
-Merge: fa1ac94... 2cf1098...
+Merge: fa1ac94 2cf1098
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Mon Oct 2 02:18:17 2006 +0300
 
@@ -20547,21 +37241,21 @@ Date:   Sat Sep 30 17:05:46 2006 +0300
     if built with --enable-debug.
 
 commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0
-Merge: 49a70c8... 84eb2c0...
+Merge: 49a70c8 84eb2c0
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Sep 29 15:37:00 2006 -0400
 
     Merge branch 'master' into my-XACE-modular
 
 commit 518db35ca3f569e7cb95dbddeddb93f3691de498
-Merge: 5d99e05... 84eb2c0...
+Merge: 5d99e05 84eb2c0
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Sep 29 00:35:21 2006 +0300
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
 
 commit 5d99e05f05a42a82a9f02844df9bfebaa673759d
-Merge: ad631af... 5893375...
+Merge: ad631af 5893375
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Sep 29 00:35:07 2006 +0300
 
@@ -20585,7 +37279,7 @@ Date:   Thu Sep 28 15:09:40 2006 -0600
     Patch by Dan Nicholson.
 
 commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145
-Merge: cf6e968... f9542e7...
+Merge: cf6e968 f9542e7
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Thu Sep 28 13:27:13 2006 -0700
 
@@ -20625,7 +37319,7 @@ Date:   Wed Aug 30 19:12:17 2006 +0200
     Add wrapper for new ioctl to update drawable information in the DRM.
 
 commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c
-Merge: 5e9d33f... f7c1d94...
+Merge: 5e9d33f f7c1d94
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sun Sep 24 17:56:43 2006 +0300
 
@@ -20829,14 +37523,14 @@ Date:   Sat Sep 16 03:49:11 2006 -0400
     Thanks, automake.
 
 commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb
-Merge: 6950267... 49a70c8...
+Merge: 6950267 49a70c8
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Sep 15 15:28:13 2006 -0400
 
     Merge branch 'my-XACE-modular' into my-XACE-SELINUX
 
 commit 49a70c8570b03aff8239324a2474918a6fbc52a0
-Merge: d1110c5... 05231e3...
+Merge: d1110c5 05231e3
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Sep 15 15:26:57 2006 -0400
 
@@ -21064,7 +37758,7 @@ Date:   Sun Sep 10 11:13:18 2006 -0700
     so I think we can tolerate the extra #ifdef for the next release.
 
 commit 60db190ecfce52cbfa888c0af3210634f9186bed
-Merge: 5e9d33f... 6525610...
+Merge: 5e9d33f 6525610
 Author: Zephaniah E. Hull <warp@agamemnon.b5>
 Date:   Sun Sep 10 03:49:17 2006 -0400
 
@@ -21089,7 +37783,7 @@ Date:   Fri Sep 8 15:31:18 2006 -0400
     Add SELinux extension configure-time support.
 
 commit fb34c02861ab3629c1c85c156e73b158518db7c7
-Merge: 9c503f0... d1110c5...
+Merge: 9c503f0 d1110c5
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Sep 8 15:30:12 2006 -0400
 
@@ -21157,7 +37851,7 @@ Date:   Thu Sep 7 15:35:16 2006 -0400
     DRI locking between 2D and 3D drivers around VT switch.
 
 commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a
-Merge: 629798c... 64479ff...
+Merge: 629798c 64479ff
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Sep 7 15:43:31 2006 +0300
 
@@ -21209,7 +37903,7 @@ Date:   Tue Sep 5 15:23:54 2006 -0700
     (unsigned long)(1 << 31) = bad news on x86_64.
 
 commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7
-Merge: 20c4ac6... c281351...
+Merge: 20c4ac6 c281351
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Tue Sep 5 18:03:25 2006 -0400
 
@@ -21275,7 +37969,7 @@ Date:   Tue Aug 29 16:35:32 2006 -0700
     appear in the server's string.
 
 commit 1c8851ad491dd02d1c79e620b46384956838ed42
-Merge: d59b52f... 5ddbf4b...
+Merge: d59b52f 5ddbf4b
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Tue Aug 29 16:34:04 2006 -0700
 
@@ -21311,7 +38005,7 @@ Date:   Tue Aug 29 23:49:26 2006 +0300
     Yeah.  That was dumb.
 
 commit 942b4369990a255257f66835caf8671432c405a3
-Merge: 77d315b... 393dc0a...
+Merge: 77d315b 393dc0a
 Author: Ian Romanick <idr@us.ibm.com>
 Date:   Tue Aug 29 13:30:37 2006 -0700
 
@@ -21371,7 +38065,7 @@ Date:   Tue Aug 29 13:19:12 2006 +0300
     couple of range-related thinkos in level name copying.
 
 commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2
-Merge: 8d77d44... ebbdc13...
+Merge: 8d77d44 ebbdc13
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Aug 29 15:16:01 2006 +0300
 
@@ -21384,14 +38078,14 @@ Date:   Mon Aug 28 18:17:32 2006 -0400
     Remove calls to LoaderCheckUnresolved(), since it's now a stub.
 
 commit 8d77d44fda3aacbae62864a3620e09095b79e92d
-Merge: d6f36bd... 2fde560...
+Merge: d6f36bd 2fde560
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sun Aug 27 23:08:49 2006 +0300
 
     Merge branch 'origin' into input-hotplug
 
 commit 20c4ac6e038607ebbf6c04639670514c016d8597
-Merge: 13c6713... 8d4f21a...
+Merge: 13c6713 8d4f21a
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Fri Aug 25 18:49:46 2006 -0400
 
@@ -21424,7 +38118,7 @@ Date:   Fri Aug 25 12:05:16 2006 -0700
     GL_NV_{vertex,fragment}_program, and related extensions can be enabled.
 
 commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9
-Merge: 1a5561c... cd2da4e...
+Merge: 1a5561c cd2da4e
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Fri Aug 25 09:34:21 2006 -0700
 
@@ -21439,7 +38133,7 @@ Date:   Fri Aug 25 12:43:17 2006 +0300
     best-effort attempt to keep configs working.
 
 commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709
-Merge: 393f834... cd2da4e...
+Merge: 393f834 cd2da4e
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Aug 25 11:15:33 2006 +0300
 
@@ -21481,7 +38175,7 @@ Date:   Thu Aug 24 17:58:52 2006 -0700
     Add some missing bits of GL_SGI_color_table.
 
 commit ae608b2071d882966e9c7ede71f846b1ecec0b23
-Merge: 2c86527... b879356...
+Merge: 2c86527 b879356
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Aug 24 14:56:33 2006 -0700
 
@@ -21504,7 +38198,7 @@ Date:   Thu Aug 24 14:49:46 2006 -0700
     Regenerate from gl_API.xml 1.62.  Functions move, no real changes.
 
 commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b
-Merge: db1ab1b... b879356...
+Merge: db1ab1b b879356
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Aug 24 23:35:28 2006 +0300
 
@@ -21542,7 +38236,7 @@ Date:   Thu Aug 24 15:50:15 2006 -0400
     More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER.
 
 commit 4ed311cf1c29090c53e474a3001c5702ff8409df
-Merge: 73e58ad... b29b236...
+Merge: 73e58ad b29b236
 Author: Matthias Hopf <mhopf@suse.de>
 Date:   Thu Aug 24 20:17:10 2006 +0200
 
@@ -21575,7 +38269,7 @@ Date:   Thu Aug 24 14:51:26 2006 +0300
     Fix horrendous thinko.  Indicators now work perfectly.
 
 commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813
-Merge: 33af05d... 67bd672...
+Merge: 33af05d 67bd672
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Aug 24 10:59:33 2006 +0300
 
@@ -21594,7 +38288,7 @@ Date:   Wed Aug 23 22:39:42 2006 +0000
     Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI
 
 commit b983773d446cef6a0948ca264ed48126e404ae9a
-Merge: 0623d36... d9a8656...
+Merge: 0623d36 d9a8656
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Wed Aug 23 17:16:50 2006 -0700
 
@@ -21716,14 +38410,14 @@ Date:   Wed Aug 23 14:33:41 2006 +0300
     the moment), and use that instead of nasty pointer assignments.
 
 commit 52ba722e4c89c052609b4fc62e965d92778aa2dd
-Merge: 9138d5a... 0554125...
+Merge: 9138d5a 0554125
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Mon Aug 21 18:49:31 2006 -0400
 
     Merge branch 'XACE-modular' into my-XACE-modular
 
 commit 05541259bdb0dfaab015a01caa3722b7a1b782e2
-Merge: c2535f6... a1ac044...
+Merge: c2535f6 a1ac044
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Aug 21 13:07:41 2006 -0700
 
@@ -21739,7 +38433,7 @@ Date:   Fri Aug 18 18:03:41 2006 +0300
     configure time.
 
 commit 0704bb298cc826cd117815898c6bc015a693c2c9
-Merge: c140369... a1ac044...
+Merge: c140369 a1ac044
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Aug 18 17:30:14 2006 +0300
 
@@ -21759,14 +38453,14 @@ Date:   Fri Aug 18 17:24:34 2006 +0300
     input.h: add InitCoreDevices prototype
 
 commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412
-Merge: 633b6a6... 70ddd0f...
+Merge: 633b6a6 70ddd0f
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Aug 18 17:05:50 2006 +0300
 
     Merge branch 'origin' into input-hotplug
 
 commit 19f673b7788d32c220e7e06734f1074b0e4a999c
-Merge: cb0a565... 70ddd0f...
+Merge: cb0a565 70ddd0f
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Aug 18 17:05:41 2006 +0300
 
@@ -21789,7 +38483,7 @@ Date:   Fri Aug 18 14:43:10 2006 +0100
     (Brett Stahlman & Colin Harrison)
 
 commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc
-Merge: e1f4565... ee5e2cb...
+Merge: e1f4565 ee5e2cb
 Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
 Date:   Fri Aug 18 09:13:52 2006 +0100
 
@@ -21834,7 +38528,7 @@ Date:   Thu Aug 17 16:22:07 2006 -0400
     It would be really nice if we only did this in one place instead of 40.
 
 commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04
-Merge: 95dbfcf... 7da5144...
+Merge: 95dbfcf 7da5144
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Aug 17 21:25:14 2006 +0300
 
@@ -21942,21 +38636,21 @@ Date:   Tue Aug 15 15:23:53 2006 +0300
     Fix debug_events prototype.
 
 commit d003bada3352ec7d734498c4c732904876a9d1e2
-Merge: d6433be... a815b9b...
+Merge: d6433be a815b9b
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Aug 12 22:48:55 2006 +0300
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
 
 commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310
-Merge: 37943e2... 984babe...
+Merge: 37943e2 984babe
 Author: George Sapountzis <gsap7@yahoo.gr>
 Date:   Sat Aug 12 21:58:33 2006 +0300
 
     Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver
 
 commit d6433be3cca807dd78fbb1f45d9ba0212283083d
-Merge: 2bf9e3d... 984babe...
+Merge: 2bf9e3d 984babe
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Aug 12 21:50:52 2006 +0300
 
@@ -22015,7 +38709,7 @@ Date:   Sat Aug 12 19:25:06 2006 +0300
     Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
 
 commit 26c3cd1c9e3f52548389817a6d89a377e20c4269
-Merge: 008aa7e... c4951e0...
+Merge: 008aa7e c4951e0
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Aug 12 18:58:18 2006 +0300
 
@@ -22044,7 +38738,7 @@ Date:   Thu Aug 10 20:43:15 2006 -0400
     mode.  Also add M_T_PREFERRED bit, to select a 'best' mode out of a set.
 
 commit c2535f67923bde0bfb0e72363467110806e2f40f
-Merge: c0cb8d1... db82e12...
+Merge: c0cb8d1 db82e12
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Aug 10 10:37:59 2006 -0700
 
@@ -22066,7 +38760,7 @@ Date:   Thu Aug 10 20:28:06 2006 +0300
     auto.
 
 commit 1a5561c4ecccaf32b03c41373adf376100d457aa
-Merge: 190f229... db82e12...
+Merge: 190f229 db82e12
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Aug 10 10:20:37 2006 -0700
 
@@ -22087,7 +38781,7 @@ Date:   Thu Aug 10 18:02:47 2006 +0300
     XKB (and thus don't need to count the extra repeat events).
 
 commit 172d45b9b75f95c997d1e9358040eead496e2a06
-Merge: 3832a3d... db82e12...
+Merge: 3832a3d db82e12
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Aug 10 14:14:54 2006 +0300
 
@@ -22132,7 +38826,7 @@ Date:   Wed Aug 9 14:48:51 2006 -0400
     Remove the bc flag from the -help text, since it's gone.
 
 commit 767f372dd02232469f9fd804b811a17eaf762e1e
-Merge: c4f5de6... 462bb61...
+Merge: c4f5de6 462bb61
 Author: Tilman Sauerbeck <tilman@code-monkey.de>
 Date:   Wed Aug 9 20:23:30 2006 +0200
 
@@ -22150,7 +38844,7 @@ Date:   Wed Aug 9 20:21:52 2006 +0200
     hooks.
 
 commit 5506b4ad200745236f997c121e8200179c47b749
-Merge: 4be9abb... 462bb61...
+Merge: 4be9abb 462bb61
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Wed Aug 9 07:21:01 2006 +0300
 
@@ -22211,7 +38905,7 @@ Date:   Tue Aug 8 14:54:10 2006 +0300
     Sending MapNotify is more correct in this case than NKN, so do that.
 
 commit 31089816317f27c668b12a15c74fdd226a8df9f7
-Merge: ab3ebfe... 12dbd8a...
+Merge: ab3ebfe 12dbd8a
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Aug 8 12:01:12 2006 +0300
 
@@ -22335,7 +39029,7 @@ Date:   Mon Aug 7 16:51:09 2006 +0300
     memcpy events into our event structure instead of doing pointer assignment.
 
 commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e
-Merge: a406f6b... f54b71b...
+Merge: a406f6b f54b71b
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Mon Aug 7 15:54:55 2006 +0300
 
@@ -22422,7 +39116,7 @@ Date:   Wed Aug 2 09:55:32 2006 -0700
     Remove pciConfigPtr and all of the associated cruft.
 
 commit 966ebd3d2d84b440e89504d055a0e937303ed11d
-Merge: a941766... 39169fd...
+Merge: a941766 39169fd
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Wed Aug 2 08:14:58 2006 -0700
 
@@ -22477,14 +39171,14 @@ Date:   Mon Jul 31 13:54:36 2006 -0700
     Build fixes for last pull from HEAD.
 
 commit 65dc25d8f86b962f2adc765a9ff327419f98092b
-Merge: 69533fc... b74c845...
+Merge: 69533fc b74c845
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Mon Jul 31 12:30:30 2006 -0700
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
 
 commit b74c845a1233f78b841ff8840272c50873300c20
-Merge: 3112a6c... 02daa6b...
+Merge: 3112a6c 02daa6b
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Mon Jul 31 10:26:06 2006 -0700
 
@@ -22508,7 +39202,7 @@ Date:   Mon Jul 31 17:32:05 2006 +0100
        and GC stripple and tile pixmaps.
 
 commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f
-Merge: ef1aeca... 24051ef...
+Merge: ef1aeca 24051ef
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Mon Jul 31 09:26:04 2006 -0700
 
@@ -22556,7 +39250,7 @@ Date:   Sun Jul 30 11:08:47 2006 +0300
     remove README (which doesn't exist) from EXTRA_DIST
 
 commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa
-Merge: 3518e2d... 654619d...
+Merge: 3518e2d 654619d
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sun Jul 30 10:51:34 2006 +0300
 
@@ -22654,7 +39348,7 @@ Date:   Wed Jul 26 13:25:13 2006 -0700
     Pass correct pointer to xf86MapLegacyIO.
 
 commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216
-Merge: eb7733a... 3821f6a...
+Merge: eb7733a 3821f6a
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Wed Jul 26 11:29:21 2006 +0300
 
@@ -22681,7 +39375,7 @@ Date:   Tue Jul 25 15:38:09 2006 -0700
     pci_device_get_bridge_buses can be used.
 
 commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7
-Merge: 82f6b7e... 8977b07...
+Merge: 82f6b7e 8977b07
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Tue Jul 25 11:30:04 2006 -0700
 
@@ -22779,7 +39473,7 @@ Date:   Sun Jul 23 19:02:12 2006 -0400
     Allow XOpenDevice on closed devices.
 
 commit e73e5e2a4d8f22889d840a7719479f9af686cb9c
-Merge: a73cef1... 8977b07...
+Merge: a73cef1 8977b07
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Jul 22 13:56:30 2006 -0400
 
@@ -22792,7 +39486,7 @@ Date:   Sun Jul 23 03:36:47 2006 +1000
     glx: fix typo from tag removal
 
 commit a73cef1f005ca66db18e952e676ee5a21b829700
-Merge: 672ca15... 70869fc...
+Merge: 672ca15 70869fc
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Jul 22 12:07:22 2006 -0400
 
@@ -22835,7 +39529,7 @@ Date:   Fri Jul 21 19:16:38 2006 -0700
     Fix stupid typos.
 
 commit 672ca156bfb11440e6e234650bfba9d38e1edb52
-Merge: d14d91f... 6cf844a...
+Merge: d14d91f 6cf844a
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Jul 21 19:58:42 2006 -0400
 
@@ -22868,7 +39562,7 @@ Date:   Fri Jul 21 16:47:45 2006 -0700
     which in turn allows the elimination of hw/xfree86/int10/pci.c.
 
 commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56
-Merge: b73fb2a... 0486d39...
+Merge: b73fb2a 0486d39
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Jul 21 19:36:25 2006 -0400
 
@@ -22883,7 +39577,7 @@ Date:   Fri Jul 21 19:35:04 2006 -0400
     XkbSA_XFree86Private.
 
 commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1
-Merge: e7ac27a... aff404f...
+Merge: e7ac27a aff404f
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Jul 21 19:30:26 2006 -0400
 
@@ -22905,7 +39599,7 @@ Date:   Fri Jul 21 19:10:26 2006 -0400
     Ugh.
 
 commit 7465010d59ec435bd00b738f0cef766b352dc7eb
-Merge: 1d31ed7... 0aaac95...
+Merge: 1d31ed7 0aaac95
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Fri Jul 21 19:05:41 2006 -0400
 
@@ -22931,7 +39625,7 @@ Date:   Fri Jul 21 18:41:46 2006 -0400
     Remove the loader's required and referenced symbol lists, dead code.
 
 commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb
-Merge: 18624a9... 22db3fd...
+Merge: 18624a9 22db3fd
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Fri Jul 21 15:25:35 2006 -0700
 
@@ -22962,7 +39656,7 @@ Date:   Thu Jul 20 18:19:07 2006 -0700
     Fix the RandR failure path for rotated screens.
 
 commit 22db3fdb54d2f7f6b72638b46c186af6db04e214
-Merge: 2f98841... 93cd538...
+Merge: 2f98841 93cd538
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Fri Jul 21 13:55:37 2006 -0700
 
@@ -23205,7 +39899,7 @@ Date:   Thu Jul 20 17:33:13 2006 -0400
     Remove the DDXTIME conditional, for being unused.
 
 commit c69c00d6523a35232a32e54a533811fc2b37815a
-Merge: 4636935... 84683f1...
+Merge: 4636935 84683f1
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Jul 20 12:08:38 2006 -0700
 
@@ -23279,7 +39973,7 @@ Date:   Thu Jul 13 21:10:48 2006 -0700
     Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
 
 commit 12595a77d6c2f037f48dfe751bdc10505b3317df
-Merge: 37838de... 4c225a3...
+Merge: 37838de 4c225a3
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Jul 13 12:48:03 2006 -0700
 
@@ -23320,7 +40014,7 @@ Date:   Sat Jul 8 21:57:07 2006 +0100
     Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc )
 
 commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b
-Merge: e805621... 39b2f7b...
+Merge: e805621 39b2f7b
 Author: Matthew Allum <mallum@polystyrene.(none)>
 Date:   Sat Jul 8 21:13:52 2006 +0100
 
@@ -23407,7 +40101,7 @@ Date:   Thu Jul 6 17:39:14 2006 -0400
     Switch the default mouse device on Linux to /dev/input/mice.
 
 commit 37838de62edc474f44c0a48bd56470a6c23f8956
-Merge: fd49a0d... 8d07ee0...
+Merge: fd49a0d 8d07ee0
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Jul 6 13:01:57 2006 -0700
 
@@ -23433,7 +40127,7 @@ Date:   Thu Jul 6 14:22:33 2006 -0400
     Spotted by Aaron Plattner.
 
 commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665
-Merge: e66e7b4... 28b95fd...
+Merge: e66e7b4 28b95fd
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Jul 6 09:52:15 2006 -0700
 
@@ -23491,7 +40185,7 @@ Date:   Wed Jun 28 15:59:01 2006 -0400
     DoGetDrawableAttributes and __glXQueryContextInfoEXT.
 
 commit e66e7b48e15543f3753951a19376f0446759963a
-Merge: a9d4842... eb35f81...
+Merge: a9d4842 eb35f81
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Wed Jul 5 15:21:36 2006 -0700
 
@@ -23605,7 +40299,7 @@ Date:   Sat Jul 1 12:34:36 2006 -0700
     Missing close parenthesis in one of the setuid() fixes.
 
 commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea
-Merge: d3d6c5f... 179737d...
+Merge: d3d6c5f 179737d
 Author: Keith Packard <keithp@neko.keithp.com>
 Date:   Sat Jul 1 11:12:50 2006 -0700
 
@@ -23633,7 +40327,7 @@ Date:   Wed Jun 7 01:46:00 2006 -0700
     Move variable declarations to start of blocks as required by c89
 
 commit a9d4842893b65232d61fe4c63f074d30e81021d2
-Merge: 66cac9b... 6bd4c25...
+Merge: 66cac9b 6bd4c25
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Fri Jun 30 11:49:29 2006 -0700
 
@@ -23647,7 +40341,7 @@ Date:   Mon Jun 26 01:52:24 2006 +0200
     Updated for Solaris 10 changes to DDI
 
 commit 66cac9b17498497d939bfb7a4075bcee5a485e5f
-Merge: 7c4e540... 54d9acd...
+Merge: 7c4e540 54d9acd
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Wed Jun 28 14:11:49 2006 -0700
 
@@ -23684,14 +40378,14 @@ Date:   Tue Jun 27 04:11:47 2006 +0200
     cairo's clip-operator test.
 
 commit 7c4e54025345455f420cd2abaa7a40679689d3cb
-Merge: 9d0a15d... ff6b59a...
+Merge: 9d0a15d ff6b59a
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Mon Jun 26 14:39:44 2006 -0700
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
 
 commit ff6b59a0dbadbe61a53e48c23965d3073d95791b
-Merge: b3c8693... 48c8715...
+Merge: b3c8693 48c8715
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jun 26 13:02:33 2006 -0700
 
@@ -23774,7 +40468,7 @@ Date:   Wed Jun 21 09:30:59 2006 -0700
     Add a manpage for EXA.
 
 commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6
-Merge: 6c514ca... d67fd10...
+Merge: 6c514ca d67fd10
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Thu Jun 22 16:21:10 2006 -0700
 
@@ -23810,7 +40504,7 @@ Date:   Wed Jun 21 18:12:41 2006 -0700
     Use XACE, not XCSECURITY to decide if SecurityLookup* are exported
 
 commit 3177dc498a955cd58cd6054a7c7e69724db4a59b
-Merge: 3f19803... 91dcac5...
+Merge: 3f19803 91dcac5
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 21 18:06:06 2006 -0700
 
@@ -23823,7 +40517,7 @@ Date:   Wed Jun 21 18:05:51 2006 -0700
     APPGROUP requires both X-ACE & XC-SECURITY now
 
 commit 91dcac5295486cc55a34ad91704bfa483bd31eeb
-Merge: d8135eb... 77c947b...
+Merge: d8135eb 77c947b
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Wed Jun 21 20:49:30 2006 -0400
 
@@ -23850,7 +40544,7 @@ Date:   Wed Jun 21 16:24:20 2006 -0700
     Correct ifdef - should be XACE, not XSECURITY
 
 commit 90af38fa0c46c2081d2becac262a614c26ba6ef1
-Merge: 3e098ef... 77c947b...
+Merge: 3e098ef 77c947b
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 21 16:23:31 2006 -0700
 
@@ -23877,7 +40571,7 @@ Date:   Wed Jun 21 16:18:41 2006 -0700
      of updates.)
 
 commit aa131c51e06e735d7b54cadf51205f703a3de4ef
-Merge: 1708b0c... 77aa701...
+Merge: 1708b0c 77aa701
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Wed Jun 21 14:39:52 2006 -0700
 
@@ -23945,7 +40639,7 @@ Date:   Tue Jun 20 19:01:34 2006 -0700
      - Added X-ACE sources to Xext/Makefile.am
 
 commit a46c06dab8392cf8012c7cc0b916de9a9e569671
-Merge: 49b368c... d44b2a0...
+Merge: 49b368c d44b2a0
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jun 20 18:40:18 2006 -0700
 
@@ -23977,7 +40671,7 @@ Date:   Tue Jun 20 18:14:27 2006 -0700
     Move Xserver API for security extension to securitysrv.h
 
 commit 49b368c0bb04816c4a3579071c596b2398cae3ec
-Merge: 63f6e6b... 481d401...
+Merge: 63f6e6b 481d401
 Author: Alan Coopersmith <alanc@alf.(none)>
 Date:   Tue Jun 20 16:22:39 2006 -0700
 
@@ -23990,7 +40684,7 @@ Date:   Tue Jun 20 16:16:19 2006 -0700
     Don't add -ldl to XORG_LIBS if it's not needed for dlopen
 
 commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7
-Merge: 88ede2c... 6df52fb...
+Merge: 88ede2c 6df52fb
 Author: Alan Coopersmith <alanc@alf.(none)>
 Date:   Tue Jun 20 16:03:34 2006 -0700
 
@@ -24003,7 +40697,7 @@ Date:   Tue Jun 20 16:02:55 2006 -0700
     Delete code that's been inside #if 0 since X11R6.7.
 
 commit 75398cff82b56c0a8fc301e84e2087f59a61a360
-Merge: 1f91b57... 2b58685...
+Merge: 1f91b57 2b58685
 Author: Ian Romanick <idr@umwelt.(none)>
 Date:   Tue Jun 20 15:49:47 2006 -0700
 
@@ -24015,7 +40709,7 @@ Date:   Tue Jun 20 15:49:47 2006 -0700
     	hw/xfree86/loader/xf86sym.c
 
 commit 88ede2cec79281a43cecb43ee6dec65770f82530
-Merge: 227a319... 2b58685...
+Merge: 227a319 2b58685
 Author: Alan Coopersmith <alanc@alf.(none)>
 Date:   Tue Jun 20 15:29:55 2006 -0700
 
@@ -24065,7 +40759,7 @@ Date:   Wed May 5 20:07:37 2004 +0000
     (cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit)
 
 commit 0707eb33d6826e1300a905edea28c12134600b12
-Merge: 37f0ae0... 98d17bb...
+Merge: 37f0ae0 98d17bb
 Author: Alan Coopersmith <alanc@alf.(none)>
 Date:   Mon Jun 19 17:09:51 2006 -0700
 
@@ -24230,7 +40924,7 @@ Date:   Fri Jun 16 10:14:30 2006 -0700
     hadn't been bumped.
 
 commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435
-Merge: fc3e814... b900883...
+Merge: fc3e814 b900883
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Tue Jun 13 21:13:02 2006 -0700
 
@@ -24257,7 +40951,7 @@ Date:   Mon Jun 12 20:12:31 2006 +0200
     Provide option to report damage after operation is complete.
 
 commit fc3e81473a98d3b932faa73c0c01c21366a48a9e
-Merge: 4bedaad... 041ef23...
+Merge: 4bedaad 041ef23
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Mon Jun 12 09:41:06 2006 -0700
 
@@ -24294,7 +40988,7 @@ Date:   Fri Jun 9 16:08:06 2006 -0700
     another function that was already in that file.
 
 commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27
-Merge: dcfaa9f... caad8b7...
+Merge: dcfaa9f caad8b7
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Fri Jun 9 15:16:50 2006 -0700
 
@@ -24366,7 +41060,7 @@ Date:   Fri Jun 9 09:51:28 2006 -0700
     based on FIXME in mi/miinitext.c
 
 commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a
-Merge: af9afe4... 576e6fb...
+Merge: af9afe4 576e6fb
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Thu Jun 8 15:03:00 2006 -0700
 
@@ -24386,7 +41080,7 @@ Date:   Thu Jun 8 17:46:53 2006 -0400
     Bug #7121: fix clipboard handling in Xming (Colin Harrison)
 
 commit af9afe4cc50df973bea2293a803f7dfdefaa6411
-Merge: caffac3... 3930da3...
+Merge: caffac3 3930da3
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Thu Jun 8 11:37:09 2006 -0700
 
@@ -24463,7 +41157,7 @@ Date:   Thu Jun 8 10:40:24 2006 -0700
     if anyone really cares about this code.
 
 commit caffac38432009e8dc01e7d3e72a7fa6fba2f078
-Merge: c5b3aa1... 9fa7372...
+Merge: c5b3aa1 9fa7372
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Thu Jun 8 10:38:43 2006 -0700
 
@@ -24574,7 +41268,7 @@ Date:   Wed Jun 7 17:44:06 2006 -0700
     when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time.
 
 commit 23182315f34e3a0065739b43b15d4560e75b41a1
-Merge: bc05158... 757f40f...
+Merge: bc05158 757f40f
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Wed Jun 7 17:03:48 2006 -0700
 
@@ -24611,7 +41305,7 @@ Date:   Wed Jun 7 14:09:13 2006 -0700
     updated the .gitignore file with more auto-generated files
 
 commit bc05158a5ab00c548e4b04b5638afe07bc702260
-Merge: 46f55f5... cc46580...
+Merge: 46f55f5 cc46580
 Author: Ian Romanick <idr@localhost.localdomain>
 Date:   Wed Jun 7 14:09:12 2006 -0700
 
@@ -24631,7 +41325,7 @@ Date:   Wed Jun 7 14:03:35 2006 -0700
     Fix compiler warnings about SetVendorRelease and SetVendorString
 
 commit 785c9789704ed142fe98cd17b5995e4a95b7141f
-Merge: 21ebcfd... 36d786e...
+Merge: 21ebcfd 36d786e
 Author: Greg Kroah-Hartman <gregkh@suse.de>
 Date:   Wed Jun 7 13:20:21 2006 -0700