diff --git a/TODO b/TODO
index 24e57f99a..bee5f8e93 100644
--- a/TODO
+++ b/TODO
@@ -4,11 +4,14 @@
 	Empty
 
 * linux-2.6-debug-taint-vm.patch
-	TODO: Push upstream
+	(on its way upstream, should be there for 3.2)
 
 * linux-2.6-acpi-video-dos.patch
 * linux-2.6-defaults-acpi-video.patch
 * linux-2.6-defaults-aspm.patch
+disable-i8042-check-on-apple-mac.patch
+linux-2.6.30-no-pcspkr-modalias.patch
+* die-floppy-die.patch
 	Fedora policy decisions
 	Turn into CONFIG_ options and upstream ?
 
@@ -16,67 +19,59 @@
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch
 * linux-2.6-silence-noise.patch
-	Fedora local 'hush' patches.  (Some will go upstream next time)
+	Fedora local 'hush' patches.  (TODO: push more upstream)
 
 * linux-2.6-makefile-after_link.patch
   Rolandware that is used by the debuginfo generation.
   Possibly upstreamable ?
 
-* linux-2.6-v4l-dvb-uvcvideo-update.patch
-  Responsible: Hans.
-
 * linux-2.6-serial-460800.patch
 	Probably not upstreamable.
 	http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
 	http://lkml.org/lkml/2006/8/2/208
 
-* linux-2.6-crash-driver.patch
-	Unlikely to go upstream.
-	https://bugzilla.redhat.com/show_bug.cgi?id=492803
-
-* linux-2.6-32bit-mmap-exec-randomization.patch
-  One half of the remaining exec-shield diff.
-  davej bugged Ingo again on Jun 17 2011 about upstreaming.
-
 * linux-2.6-acpi-debug-infinite-loop.patch
   Responsible: mjg59
 
-* linux-2.6-v4l-dvb-experimental.patch
-* linux-2.6-v4l-dvb-fixes.patch
-* linux-2.6-v4l-dvb-update.patch
-  Empty.
-
 * fix_xen_guest_on_old_EC2.patch
   Ugly for upstream. It's a hack to make old HV's work optimally.
   Eventually we can drop it, but probably not until fixed HV's
   are commonplace. (When?)
   Responsible: Justin.
 
+* add-appleir-usb-driver.patch
+  Added September 2009, but had been around even before that. Wtf ?
+  Responsible: Bastien
+
+* dmar-disable-when-ricoh-multifunction.patch
+  Added Octoboer 2010
+
+* drm-intel-make-lvds-work.patch
+  Around since forever. Wtf ?
+
+* linux-2.6-intel-iommu-igfx.patch
+  Invert igfx_off/igfx_on option. Around since forever. Upstreamable ?
+  Mustard ? Config option ?
+
+*************************************************************************
+
+'MUSTARD' patches.  Fedora local patches that are very unlikely to go upstream.
+
+* linux-2.6-32bit-mmap-exec-randomization.patch
+  One half of the remaining exec-shield diff.
+  davej bugged Ingo again on Jun 17 2011 about upstreaming.
+
 * linux-2.6-i386-nx-emulation.patch
   The ugly segment hack part of exec-shield that Linus hates.
   Unlikely to ever go upstream.
 
+* linux-2.6-crash-driver.patch
+	Unlikely to go upstream.
+	https://bugzilla.redhat.com/show_bug.cgi?id=492803
+
 * linux-2.6-e1000-ich9-montevina.patch
   Intel hates it. Davej has an SDV that needs it.
   Low maintenence, and worth hanging onto until it gets replaced
   with something that fails in a different way.
 
---------
-currently undocumented:
-
-add-appleir-usb-driver.patch
-die-floppy-die.patch
-disable-i8042-check-on-apple-mac.patch
-dmar-disable-when-ricoh-multifunction.patch
-drm-intel-make-lvds-work.patch
-drm-intel-next.patch
-drm-nouveau-updates.patch
-hda_intel-prealloc-4mb-dmabuffer.patch
-linux-2.6.30-no-pcspkr-modalias.patch
-linux-2.6-input-kill-stupid-messages.patch
-linux-2.6-intel-iommu-igfx.patch
-linux-2.6-upstream-reverts.patch
-linux-3.0-fix-uts-release.patch
-neuter_intel_microcode_load.patch
-