Merge branch 'linus' into core/softlockup

Browse source

Conflicts:

	kernel/softlockup.c

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

...

This commit is contained in:

Ingo Molnar 2008-07-15 23:12:58 +02:00

parent 3e2f69fdd1 b9d2252c1e

commit 1e09481365

2805 changed files with 248658 additions and 173743 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

31

kernel/sysctl.c

View file