--- a/open-src/xserver/xorg/patch-list	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/xserver/xorg/patch-list	Sat Dec 05 22:13:03 2009 -0800
@@ -1,27 +1,15 @@
-xkb-defaults.patch,-p1
-xkb-defaults-compat.patch
-constify-atom-strings.patch,-p1
+server-1.7-nominations.patch,-p1
 resource-names.patch,-p1
-apm-handlers.patch,-p1
-agpgart.patch,-p1
-solaris-asm.patch,-p1
-XaceHook-initializers.patch,-p1
-Xephyr-Xserver-man.patch,-p1
 sun-paths.patch
 sun-extramodes.patch
 sun-manpage.patch
 cli-nolock.patch
 cli-nobanner.patch
-catch-dlerrors.patch
-sigio.patch,-p1
-sigio-disable.patch,-p1
 make_xkm_output_dir.patch
 dtlogin-userinfo.patch
 IA.patch
 xtsol.patch
-sun-loginfo.patch
 amd64-loader-path.patch
-Xorg-mapfile.patch
 fontmod.patch
 sparc-probe.patch
 sparc-nopciprobe.patch
@@ -33,11 +21,9 @@
 6535006.patch
 signal-handler.patch
 6721634.patch
-xpstubs.patch
 dixmods-deps.patch
 sparc-initvisuals.patch
 hotkey.patch
 vt.patch
-6885229.patch
-xf86pciBus.c.patch
 vbe-packing.patch
+exa-workaround.patch