From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Jul 2008 21:32:00 +0000 (+0200)
Subject: Merge branch 'linus' into cpus4096
X-Git-Tag: v2.6.27-rc1~23^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e3ee1c39c0cc71222f9980ccbf87fe072897eef;p=linux-2.6

Merge branch 'linus' into cpus4096

Conflicts:

	kernel/stop_machine.c

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

9e3ee1c39c0cc71222f9980ccbf87fe072897eef