Merge branch 'linus' into cpus4096

Browse Source

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar

2008-07-16 00:29:07 +02:00

parent 9982fbface 63cf13b77a

commit 82638844d9

2558 changed files with 166841 additions and 99878 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

835

kernel/sched.c

File diff suppressed because it is too large Load Diff