From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Jul 2008 14:26:31 +0000 (+0200)
Subject: Merge branch 'linus' into x86/cpu
X-Git-Tag: v2.6.28-rc1~699^2^8~5^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7d0b6784565b846f3562608dfb3cf8516718724;p=pandora-kernel.git

Merge branch 'linus' into x86/cpu

Conflicts:

	arch/x86/kernel/cpu/intel_cacheinfo.c

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

b7d0b6784565b846f3562608dfb3cf8516718724
Reading git-diff-tree failed