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

parent 7be7585393 8299608f14

commit 968ea6d80e

215 changed files with 10629 additions and 3965 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1142

kernel/sched.c

View file

File diff suppressed because it is too large Load diff