git: Merge branch 'apic_io'

[Michael Neumann]

commit c4ce4f88f289f77826fecf470965d7e216274018
Merge: a367b31a69b7efb4f245fd97f859bd0516d98605 ea90da15977025b065f1d57b274b61c8e08e9f75
Author: Michael Neumann <mneumann at ntecs.de>
Date:   Sun Nov 7 22:43:54 2010 +0100

    Merge branch 'apic_io'
    
    Conflicts:
    	sys/platform/pc64/conf/options

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/c4ce4f88f289f77826fecf470965d7e216274018


-- 
DragonFly BSD source repository