Ingo Weinhold 19ae20e67e Merge branch 'master' into pm-flat ...

Conflicts:
	build/jam/HaikuImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	build/jam/UserBuildConfig.sample
	data/bin/installoptionalpackage
	src/apps/deskbar/DeskbarMenu.cpp
	src/servers/debug/DebugServer.cpp
	src/system/kernel/fs/vfs.cpp

2011-11-05 17:00:01 +01:00

..

arch

Some more 68k mmu definitions I forgot to commit.

2011-11-03 01:05:54 +00:00

boot

Merge branch 'master' into pm-flat

2011-11-05 17:00:01 +01:00

disk_device_manager

* Added file_system_module_info::uninitialize() analogously to

2011-06-13 01:53:11 +00:00

fs

…

platform

* Rename of_region type template as per Axel

2011-07-26 16:42:14 +00:00

posix

…

slab

Add new operator that takes an ObjectCache* and allocation flags and

2011-11-02 21:12:09 +00:00

util

Merge branch 'master' into pm-flat

2011-11-05 17:00:01 +01:00

vm

mmlr (distracted) + bonefish:

2011-11-02 21:14:11 +00:00

block_cache.h

…

boot_device.h

…

boot_item.h

…

boot_splash.h

…

commpage.h

…

condition_variable.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

console.h

…

cpu.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

debug_heap.h

…

debug_paranoia.h

…

debug.h

mmlr + bonefish:

2011-11-01 17:19:26 +00:00

debugger_keymaps.h

…

DPC.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

elf_priv.h

…

elf.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

file_cache.h

…

frame_buffer_console.h

…

generic_syscall.h

…

heap.h

…

int.h

* Introduce {reserve|allocate|free}_io_interrupt_vectors() that can generically

2011-10-12 20:55:28 +00:00

kdevice_manager.h

…

kdriver_settings.h

…

kernel_c++_structs.h

…

kernel_daemon.h

…

kernel.h

…

kimage.h

…

kmodule.h

…

kscheduler.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

ksignal.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

ksyscalls.h

…

ksystem_info.h

…

listeners.h

…

lock.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

low_resource_manager.h

…

messaging.h

…

MessagingServiceDefs.h

…

Notifications.h

…

port.h

…

real_time_clock.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

safemode.h

…

scheduling_analysis.h

…

sem.h

…

smp.h

Added try_acquire_spinlock().

2011-06-14 12:41:11 +00:00

syscall_restart.h

…

system_profiler.h

…

team.h

* Added function team_init_exit_info_on_error() which initializes the team's

2011-06-14 13:04:31 +00:00

thread_types.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

thread.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

timer.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

tracing.h

bonefish+mmlr:

2011-11-02 16:02:07 +00:00

user_atomic.h

…

user_debugger.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

user_mutex.h

…

UserEvent.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

usergroup.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

UserTimer.h

Merged signals-merge branch into trunk with the following changes:

2011-06-12 00:00:23 +00:00

vfs.h

Merge branch 'master' into pm-flat

2011-11-05 17:00:01 +01:00

wait_for_objects.h

…