Merge commit '973c11b9c3cdde88fe6ca0ef2c5af56a8c49e014' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Mon, 6 Jul 2009 14:54:20 +0000 (17:54 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Mon, 6 Jul 2009 14:54:20 +0000 (17:54 +0300)
commit2123d4c3ca3af9eacc959aeef05afcb05ed0af39
tree8545a4e9d7d4c7e1f3d499fc8f11d9ba21f3e558
parent53116cdcc6eba9e641f1c323a063e944f947fc78
parent973c11b9c3cdde88fe6ca0ef2c5af56a8c49e014
Merge commit '973c11b9c3cdde88fe6ca0ef2c5af56a8c49e014' into amd64
sys/platform/pc64/amd64/trap.c
sys/platform/pc64/amd64/vm_machdep.c