diff --git a/TODO b/TODO
index 11905dfd3..968324422 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,16 @@
 * linux-2.6-silence-noise.patch
 	Fedora local 'hush' patches.  (Some will go upstream next time)
 
+* linux-2.6-makefile-after_link.patch
+  Rolandware that is used by the debuginfo generation.
+  Possibly upstreamable ?
+
+* linux-2.6.29-sparc-IOC_TYPECHECK.patch
+  Responsible: Spot/Dennis.
+
+* 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
@@ -29,10 +39,40 @@
 	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.
+
+* runtime_pm_fixups.patch
+* linux-2.6-usb-pci-autosuspend.patch
+* linux-2.6-enable-more-pci-autosuspend.patch
+* linux-2.6-acpi-debug-infinite-loop.patch
+* acpi-ec-add-delay-before-write.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.
+
+* 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-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:
 
-acpi-ec-add-delay-before-write.patch
 add-appleir-usb-driver.patch
 die-floppy-die.patch
 disable-i8042-check-on-apple-mac.patch
@@ -40,24 +80,11 @@ dmar-disable-when-ricoh-multifunction.patch
 drm-intel-make-lvds-work.patch
 drm-intel-next.patch
 drm-nouveau-updates.patch
-fix_xen_guest_on_old_EC2.patch
 hda_intel-prealloc-4mb-dmabuffer.patch
-linux-2.6.29-sparc-IOC_TYPECHECK.patch
 linux-2.6.30-no-pcspkr-modalias.patch
-linux-2.6-32bit-mmap-exec-randomization.patch
-linux-2.6-acpi-debug-infinite-loop.patch
-linux-2.6-e1000-ich9-montevina.patch
-linux-2.6-enable-more-pci-autosuspend.patch
-linux-2.6-i386-nx-emulation.patch
 linux-2.6-input-kill-stupid-messages.patch
 linux-2.6-intel-iommu-igfx.patch
-linux-2.6-makefile-after_link.patch
 linux-2.6-upstream-reverts.patch
-linux-2.6-usb-pci-autosuspend.patch
-linux-2.6-v4l-dvb-experimental.patch
-linux-2.6-v4l-dvb-fixes.patch
-linux-2.6-v4l-dvb-update.patch
-linux-2.6-v4l-dvb-uvcvideo-update.patch
 linux-3.0-fix-uts-release.patch
 neuter_intel_microcode_load.patch
-runtime_pm_fixups.patch
+