From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Jul 2008 21:12:58 +0000 (+0200)
Subject: Merge branch 'linus' into core/softlockup
X-Git-Tag: v2.6.27-rc1~849^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e09481365ce248dbb4eb06dad70129bb5807037;p=linux-2.6

Merge branch 'linus' into core/softlockup

Conflicts:

	kernel/softlockup.c

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

1e09481365ce248dbb4eb06dad70129bb5807037