From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 11:01:51 +0000 (+0100)
Subject: Merge branch 'linus' into core/percpu
X-Git-Tag: v2.6.30-rc1~2^2~50^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ddeb51d9c83931c1ca6abf76a38934c5a1ed918;p=pandora-kernel.git

Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c
---

3ddeb51d9c83931c1ca6abf76a38934c5a1ed918
Reading git-diff-tree failed