forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge ../linux-2.6-x86

Browse source 
Conflicts:

	arch/x86/kernel/io_apic.c
	kernel/sched.c
	kernel/sched_stats.h
This commit is contained in:
Rusty Russell 2008-12-13 21:55:51 +10:30
commit 968ea6d80e
215 changed files with 10629 additions and 3965 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/interrupt.h
View file

@ -14,6 +14,8 @@
#include <linux/irqflags.h>
#include <linux/smp.h>
#include <linux/percpu.h>
#include <linux/irqnr.h>
#include <asm/atomic.h>
#include <asm/ptrace.h>
#include <asm/system.h>