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/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/sysdev.h>
 #include <linux/errno.h>