Merge from Linus' tree

2005-10-12 14:43:32 +10:00
parent 3a5f8c5f78 da64c6ee6b
commit b6ec995a21
626 changed files with 23967 additions and 4613 deletions
--- a/arch/ppc/platforms/gemini_setup.c
+++ b/arch/ppc/platforms/gemini_setup.c
@ -21,7 +21,6 @@
 #include <linux/major.h>
 #include <linux/initrd.h>
 #include <linux/console.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/bcd.h>