Ingo Molnar b8cd9d056b Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1 ...

Conflicts:
	include/asm-x86/dma-mapping.h
	include/asm-x86/gpio.h
	include/asm-x86/idle.h
	include/asm-x86/kvm_host.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

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

2008-10-06 16:15:57 +02:00

..

bios.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

uv_bau.h

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

2008-10-06 16:15:57 +02:00

uv_hub.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

uv_mmrs.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00