Ingo Molnar a1413c89ae Merge branch 'x86/urgent' into x86/core ...

Conflicts:
	arch/x86/include/asm/fixmap_64.h
Semantic merge:
	arch/x86/include/asm/fixmap.h

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

2009-03-05 21:48:50 +01:00

..

drm

Merge branch 'x86/urgent' into x86/core

2009-03-05 21:48:50 +01:00

Makefile

drm: reorganise drm tree to be more future proof.

2008-07-14 10:45:01 +10:00