Merge branch 'master'

This commit is contained in:
Steven Whitehouse 2006-04-21 12:52:36 -04:00
commit a748422ee4
1121 changed files with 22788 additions and 56322 deletions

View file

@ -177,7 +177,7 @@ static inline void console_verbose(void)
extern void bust_spinlocks(int yes);
extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
extern __deprecated_for_modules int panic_timeout;
extern int panic_timeout;
extern int panic_on_oops;
extern int tainted;
extern const char *print_tainted(void);