Minor modifications
Fixed conflict
Merge branch 'master' of ssh://github.com/warrantyvoids/VOS

Conflicts:
	src/sys/arch/i686/drv/pci/pci.c