Merge branch 'merge'

This commit is contained in:
Paul Mackerras
2006-08-01 10:37:25 +10:00
1510 changed files with 22961 additions and 13521 deletions

View File

@@ -26,7 +26,7 @@
#include <linux/ioport.h>
#include <linux/console.h>
#include <linux/utsname.h>
#include <linux/tty.h>
#include <linux/screen_info.h>
#include <linux/root_dev.h>
#include <linux/notifier.h>
#include <linux/cpu.h>