Merge branch 'linus' into cpus4096

Browse source

Conflicts:

	kernel/stop_machine.c

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

...

This commit is contained in:

Ingo Molnar 2008-07-28 23:32:00 +02:00

parent e56b3bc794 f934fb19ef

commit 9e3ee1c39c

1237 changed files with 52188 additions and 43705 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

16

kernel/cpu.c

View file

33

kernel/module.c

View file

4

kernel/rcuclassic.c

View file

311

kernel/stop_machine.c

View file

6

kernel/trace/ftrace.c

View file