diff --git a/[refs] b/[refs]
index 98cb09b3d28f..ed355027b32f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e57aa11abb15b70db53d1f95ae70b3c980ac885
+refs/heads/master: cb065c06b6cc615a58860d619d7fa7952cd6a18b
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
index 63b4550411be..9aa1dda5d38c 100644
--- a/trunk/Documentation/feature-removal-schedule.txt
+++ b/trunk/Documentation/feature-removal-schedule.txt
@@ -352,3 +352,12 @@ When:	2.6.32
 Why:	__do_IRQ was kept for easy migration to the type flow handlers.
 	More than two years of migration time is enough.
 Who:	Thomas Gleixner <tglx@linutronix.de>
+
+-----------------------------
+
+What:	obsolete generic irq defines and typedefs
+When:	2.6.30
+Why:	The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t)
+	have been kept around for migration reasons. After more than two years
+	it's time to remove them finally
+Who:	Thomas Gleixner <tglx@linutronix.de>