Ingo Molnar 82268da1b1 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>

2009-03-28 04:26:01 +01:00

..

drm

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

2009-03-28 04:26:01 +01:00

Makefile

…