gitweb.dragonflybsd.org Git - dragonfly.git/commit

author	Michael Neumann <mneumann@ntecs.de>
	Sun, 7 Nov 2010 21:43:54 +0000 (22:43 +0100)
committer	Michael Neumann <mneumann@ntecs.de>
	Sun, 7 Nov 2010 21:43:54 +0000 (22:43 +0100)
commit	c4ce4f88f289f77826fecf470965d7e216274018
tree	a96e50924389822a52ba19f7906db92b98637324	tree
parent	a367b31a69b7efb4f245fd97f859bd0516d98605	commit \| diff
parent	ea90da15977025b065f1d57b274b61c8e08e9f75	commit \| diff

Merge branch 'apic_io'

Conflicts:
sys/platform/pc64/conf/options

Unnamed repository; edit this file to name it for gitweb.

sys/config/LINT	diff1 \|	diff2 \|	blob \| history
sys/config/X86_64_GENERIC	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/apic/apic_ipl.s	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/apic/apic_vector.s	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/conf/options	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/icu/icu_vector.s	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/include/clock.h	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/isa/clock.c	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/x86_64/machdep.c	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/x86_64/mp_machdep.c	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/x86_64/nexus.c	diff1 \|	diff2 \|	blob \| history