+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22129
+
--- /tmp/servermd.h 2007-09-30 17:27:22.310911628 +0200
+++ xorg-server-1.4/include/servermd.h 2007-09-30 17:28:25.297799199 +0200
@@ -130,6 +130,16 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
+++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
@@ -38,7 +38,7 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133
+
--- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300
+++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200
@@ -25,6 +25,7 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22130
+
--- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100
+++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100
@@ -38,7 +38,6 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22132
+
--- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700
+++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600
@@ -2,7 +2,7 @@
+upstream: not applicable to upstream
+
--- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000
+++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000
@@ -117,8 +117,8 @@