modified: vdev.h vdev.c

modifed: trap.c trap.h

	modified:   include/vdev.h
	modified:   trap.c
	modified:   vdev/vdev.c
	modified:   vdev/vdev_gicd.c
	modified:   vdev/vdev_gicd.h
	modified:   vdev/vdev_timer.h
Merge branch 'v1' of https://github.com/kim6515516/khypervisor into v1

Conflicts:
	hypervisor/include/vdev.h
	hypervisor/trap.c
	hypervisor/vdev/vdev.c

	modified:   include/vdev.h