- cleanup merge mess
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 5 Dec 2008 16:42:35 +0000 (16:42 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 5 Dec 2008 16:42:35 +0000 (16:42 +0000)
commit74e41179f8771fabffaddb31c32828648bc3e624
treea934b815ca968276b33446069c15e2d555e82f26
parent4f4ec6b380abaf62aacea646878e28e6b54c4095
- cleanup merge mess

svn path=/branches/ros-amd64-bringup/; revision=37870
reactos/ntoskrnl/include/internal/ntoskrnl.h
reactos/ntoskrnl/include/internal/probe.h