Merge branch coreboot.
authorGerd Zellweger <mail@gerdzellweger.com>
Wed, 15 Oct 2014 12:50:16 +0000 (14:50 +0200)
committerGerd Zellweger <mail@gerdzellweger.com>
Wed, 15 Oct 2014 12:50:16 +0000 (14:50 +0200)
commit98789efbb9d6a6cab7159d4efe147f1bcf5428b9
treec2c2bf458a795e5ae4caf2486f3880c61f493ec7
parenta4a83726f876629e39bb1ef6d53f99ce9d0074d7
parentaf1bdebbf222cc3208470923f24619c8d8d38b33
Merge branch coreboot.

Conflicts:
errors/errno.fugu
hake/menu.lst.x86_64
hake/symbolic_targets.mk
if/intermon.if
include/barrelfish/domain.h
include/barrelfish_kpi/dispatcher_shared.h
include/barrelfish_kpi/init.h
include/target/x86/barrelfish_kpi/coredata_target.h
include/trace/trace.h
kernel/Hakefile
kernel/arch/arm_gem5/paging.c
kernel/arch/armv7/syscall.c
kernel/arch/omap44xx/paging.c
kernel/arch/x86/init_ap_x86_64.S
kernel/arch/x86/syscall.c
kernel/arch/x86_32/start_aps.c
kernel/arch/x86_64/irq.c
kernel/capabilities.c
kernel/dispatch.c
kernel/include/arch/x86/start_aps.h
kernel/include/serial.h
kernel/schedule_rbed.c
kernel/startup.c
kernel/syscall.c
lib/bomp/bf_backend.c
lib/mdb/mdb_tree.c
lib/nfs/rpc.c
lib/posixcompat/inheritance.c
lib/posixcompat/select.c
lib/spawndomain/spawn.c
tools/debug.sh
usr/acpi/acpi_service.c
usr/drivers/e1000/e1000n.c
usr/kaluga/Hakefile
usr/monitor/spawn.c
usr/pci/pci.c
usr/pci/pci.h
usr/spawnd/bsp_bootup.c
usr/spawnd/main.c
usr/tests/nkm/modify_flags.c
usr/tests/testdesc/testdesc.c
61 files changed:
errors/errno.fugu
hake/menu.lst.x86_64
hake/symbolic_targets.mk
if/intermon.if
if/pci.if
include/barrelfish/dispatch.h
include/barrelfish/domain.h
include/barrelfish/inthandler.h
include/barrelfish/spawn_client.h
include/barrelfish_kpi/dispatcher_shared.h
include/barrelfish_kpi/init.h
include/pci/pci.h
include/target/x86/barrelfish_kpi/coredata_target.h
include/trace/trace.h
kernel/Hakefile
kernel/arch/omap44xx/init.c
kernel/arch/x86/apic.c
kernel/arch/x86/startup_x86.c
kernel/arch/x86/syscall.c
kernel/arch/x86/timing.c
kernel/arch/x86_64/irq.c
kernel/arch/x86_64/startup_arch.c
kernel/arch/x86_64/syscall.c
kernel/capabilities.c
kernel/dispatch.c
kernel/include/arch/x86/start_aps.h
kernel/include/arch/x86/x86.h
kernel/include/serial.h
kernel/schedule_rbed.c
kernel/syscall.c
lib/barrelfish/arch/x86_64/dispatch.c
lib/barrelfish/domain.c
lib/barrelfish/inthandler.c
lib/barrelfish/spawn_client.c
lib/mdb/mdb_tree.c
lib/pci/pci_client.c
lib/posixcompat/sockets.c
lib/spawndomain/spawn.c
tools/asmoffsets/asmoffsets.c
trace_definitions/trace_defs.pleco
usr/acpi/acpi_service.c
usr/acpi/apic.c
usr/bfscope/bfscope.c
usr/drivers/e1000/e1000n.c
usr/kaluga/Hakefile
usr/kaluga/boot_modules.c
usr/kaluga/driver_startup.c
usr/kaluga/main.c
usr/kaluga/omap_startup.c
usr/kaluga/start_pci.c
usr/monitor/arch/x86/boot.c
usr/monitor/spawn.c
usr/pci/pci.c
usr/pci/pci.h
usr/pci/pci_service.c
usr/spawnd/Hakefile
usr/spawnd/main.c
usr/startd/main.c
usr/tests/mdbtests/test_range_query.c
usr/tests/net-test/net-test.c
usr/tests/testdesc/testdesc.c