Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / x86 / platform / uv / bios_uv.c

diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
similarity index 100%
rename from arch/x86/kernel/bios_uv.c
rename to arch/x86/platform/uv/bios_uv.c