Merge branch 'master' into upstream

2007-02-17 15:11:43 -05:00
parent 48c871c1f6 8a03d9a498
commit f630fe2817
1487 changed files with 43559 additions and 15646 deletions
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -20,7 +20,6 @@
 */

 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>