Merge commit 'v2.6.34-rc7' into perf/nmi
authorFrederic Weisbecker <fweisbec@gmail.com>
Wed, 12 May 2010 21:19:01 +0000 (23:19 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Wed, 12 May 2010 21:20:33 +0000 (23:20 +0200)
commita9aa1d02de36b450990b0e25a88fc2ff1c3e6b94
tree1f9d19f1642d263e65906a916a48be9339accc73
parent5671a10e2bc7f99d9157c6044faf8be2ef302361
parentb57f95a38233a2e73b679bea4a5453a1cc2a1cc9
Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.
arch/x86/Kconfig
arch/x86/kernel/apic/nmi.c
init/Kconfig
kernel/Makefile
kernel/sysctl.c
lib/Kconfig.debug