-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22129
+upstream: applied in 82b37d35af13a9f402755e167493ab256b664b9c (2008-04-22)
--- /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
+upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882
+
Index: xorg-server-1.4/hw/kdrive/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200
+upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882
+
Index: xorg-server-1.4/hw/kdrive/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200
+upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882
+
Index: xorg-server-1.4/hw/kdrive/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200
+upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882
+
Index: xorg-server-1.4/hw/kdrive/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
+upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882
+
Index: xorg-server-1.4/hw/kdrive/Makefile.am
===================================================================
--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200
+upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882
+
Index: git/hw/kdrive/Makefile.am
===================================================================
--- git.orig/hw/kdrive/Makefile.am 2006-09-02 12:12:13.000000000 +0200
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
--- 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
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
===================================================================
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
===================================================================
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22130
+upstream: not applicable upstream. The relevant code seems to have been dropped
+ within the last three years. the outdated cvs recipe is the only bb that uses
+ this patch.
--- 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
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================