haiku

mirror of https://review.haiku-os.org/haiku synced 2025-01-23 23:04:48 +01:00

History

Alex Smith 11c9f9a1d6 Merge branch 'master' into x86_64

Conflicts:
	build/jam/FloppyBootImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	headers/private/shared/cpu_type.h
	src/bin/ps.c
	src/bin/sysinfo.cpp
	src/kits/tracker/PoseView.cpp
	src/preferences/appearance/DecorSettingsView.cpp
	src/preferences/virtualmemory/Settings.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/input/InputServer.cpp
	src/servers/input/InputServerMethod.cpp
	src/system/boot/Jamfile
	src/system/boot/platform/raspberrypi_arm/mmu.cpp
	src/system/boot/platform/u-boot/arch/arm/Jamfile
	src/system/kernel/arch/x86/arch_cpu.cpp
	src/system/kernel/arch/x86/arch_thread.cpp
	src/system/kernel/cache/block_cache.cpp
	src/system/kernel/vm/VMAnonymousCache.cpp

2012-11-18 14:02:07 +00:00

net

boot_net: Add iSCSI initiator support

2010-09-05 22:30:41 +00:00

platform

Merge branch 'master' into x86_64

2012-11-18 14:02:07 +00:00

addr_range.h

Remove phys_addr_range, just use addr_range for both virtual and physical address ranges (as requested by Ingo).

2012-06-21 19:48:03 +01:00

arch.h

Changed the boot ELF code to use templates and added ELF64 support.