From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 25 Jun 2008 10:30:10 +0000 (+0200)
Subject: Merge branch 'linus' into x86/delay
X-Git-Tag: v2.6.27-rc1~1106^2~249^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28f73e51d0f64a5b896ad816ab8df6f3bcec5810;p=pandora-kernel.git

Merge branch 'linus' into x86/delay

Conflicts:

	arch/x86/kernel/tsc_32.c

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

28f73e51d0f64a5b896ad816ab8df6f3bcec5810
Reading git-diff-tree failed