]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into core/softlockup
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 21:12:58 +0000 (23:12 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 21:12:58 +0000 (23:12 +0200)
commit1e09481365ce248dbb4eb06dad70129bb5807037
treec0cff5bef95c8b5e7486f144718ade9a06c284dc
parent3e2f69fdd1b00166e7d589bce56b2d36a9e74374
parentb9d2252c1e44fa83a4e65fdc9eb93db6297c55af
Merge branch 'linus' into core/softlockup

Conflicts:

kernel/softlockup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
include/linux/sched.h
kernel/sysctl.c
kernel/time/tick-sched.c
lib/Kconfig.debug