tree 203e2204daaec4cf005463fdf2c7bf380d6eef36
parent cf9972a921470b0a2da7906104bcd540b20e33bf
parent 0af48f42df15b97080b450d24219dd95db7b929a
author H. Peter Anvin <hpa@zytor.com> 1243122139 -0700
committer H. Peter Anvin <hpa@zytor.com> 1243122139 -0700

Merge branch 'x86/urgent' into x86/setup

Resolved conflicts:
	arch/x86/boot/memory.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>