From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 28 Mar 2009 03:21:18 +0000 (+0100)
Subject: Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
X-Git-Tag: v2.6.30-rc1~639^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82268da1b130f763d22d04f7d016bbf6fc8815c2;p=pandora-kernel.git

Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

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

82268da1b130f763d22d04f7d016bbf6fc8815c2
Reading git-diff-tree failed