tree 9803f361556d10708313e980428e63a18162e667
parent 6e15cf04860074ad032e88c306bea656bbdd0f22
parent 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a
author Ingo Molnar <mingo@elte.hu> 1238210478 +0100
committer Ingo Molnar <mingo@elte.hu> 1238210761 +0100

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>