Sync with trunk (48237)

svn path=/branches/reactos-yarotows/; revision=48246

diff --cc base/applications/cmdutils/reg/Pt.rc
Simple merge

diff --cc base/applications/cmdutils/reg/Uk.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/It.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/Ko.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/Pt.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/Uk.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/rsrc.rc
Simple merge

diff --cc base/applications/rapps/rapps/firefox36.txt
Simple merge

diff --cc base/applications/rapps/rapps/kdewin.txt
Simple merge

diff --cc base/applications/rapps/rapps/mirandaim.txt
Simple merge

diff --cc base/applications/rapps/rapps/mono2.txt
Simple merge

diff --cc base/applications/rapps/rapps/opera.txt
Simple merge

diff --cc base/applications/rapps/rapps/rosbeamd64.txt
Simple merge

diff --cc base/applications/rapps/rapps/seamonkey.txt
Simple merge

diff --cc base/applications/rapps/rapps/thunderbird.txt
Simple merge

diff --cc base/applications/rapps/rapps/utorrent.txt
Simple merge

diff --cc base/applications/rapps/rapps/vlc.txt
Simple merge

diff --cc base/applications/winhlp32/Bg.rc
Simple merge

diff --cc base/applications/winhlp32/Cs.rc
Simple merge

diff --cc base/applications/winhlp32/Da.rc
Simple merge

diff --cc base/applications/winhlp32/De.rc
Simple merge

diff --cc base/applications/winhlp32/En.rc
Simple merge

diff --cc base/applications/winhlp32/Es.rc
Simple merge

diff --cc base/applications/winhlp32/Fi.rc
Simple merge

diff --cc base/applications/winhlp32/Fr.rc
Simple merge

diff --cc base/applications/winhlp32/Hu.rc
Simple merge

diff --cc base/applications/winhlp32/It.rc
Simple merge

diff --cc base/applications/winhlp32/Ja.rc
Simple merge

diff --cc base/applications/winhlp32/Ko.rc
Simple merge

diff --cc base/applications/winhlp32/Lt.rc
Simple merge

diff --cc base/applications/winhlp32/Nl.rc
Simple merge

diff --cc base/applications/winhlp32/No.rc
Simple merge

diff --cc base/applications/winhlp32/Pl.rc
Simple merge

diff --cc base/applications/winhlp32/Pt.rc
Simple merge

diff --cc base/applications/winhlp32/Rm.rc
Simple merge

diff --cc base/applications/winhlp32/Ro.rc
Simple merge

diff --cc base/applications/winhlp32/Ru.rc
Simple merge

diff --cc base/applications/winhlp32/Si.rc
Simple merge

diff --cc base/applications/winhlp32/Sk.rc
Simple merge

diff --cc base/applications/winhlp32/Sv.rc
Simple merge

diff --cc base/applications/winhlp32/Tr.rc
Simple merge

diff --cc base/applications/winhlp32/Uk.rc
Simple merge

diff --cc base/applications/winhlp32/Zh.rc
Simple merge

diff --cc base/applications/wordpad/Da.rc
Simple merge

diff --cc base/applications/wordpad/De.rc
Simple merge

diff --cc base/applications/wordpad/En.rc
Simple merge

diff --cc base/applications/wordpad/Fr.rc
Simple merge

diff --cc base/applications/wordpad/Hu.rc
Simple merge

diff --cc base/applications/wordpad/It.rc
Simple merge

diff --cc base/applications/wordpad/Ja.rc
Simple merge

diff --cc base/applications/wordpad/Ko.rc
Simple merge

diff --cc base/applications/wordpad/Lt.rc
Simple merge

diff --cc base/applications/wordpad/Nl.rc
Simple merge

diff --cc base/applications/wordpad/No.rc
Simple merge

diff --cc base/applications/wordpad/Pl.rc
Simple merge

diff --cc base/applications/wordpad/Pt.rc
Simple merge

diff --cc base/applications/wordpad/Ro.rc
index 0000000,4db8a95..4db8a95
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/wordpad/Ro.rc
+++ b/base/applications/wordpad/Ro.rc

diff --cc base/applications/wordpad/Ru.rc
Simple merge

diff --cc base/applications/wordpad/Si.rc
Simple merge

diff --cc base/applications/wordpad/Sv.rc
Simple merge

diff --cc base/applications/wordpad/Tr.rc
Simple merge

diff --cc base/applications/wordpad/Uk.rc
Simple merge

diff --cc base/applications/wordpad/Zh.rc
Simple merge

diff --cc base/applications/wordpad/olecallback.c
index 0000000,8b279ad..8b279ad
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/wordpad/olecallback.c
+++ b/base/applications/wordpad/olecallback.c

diff --cc base/applications/wordpad/print.c
Simple merge

diff --cc base/applications/wordpad/registry.c
Simple merge

diff --cc base/applications/wordpad/rsrc.rc
Simple merge

diff --cc base/applications/wordpad/wordpad.c
Simple merge

diff --cc base/applications/wordpad/wordpad.h
Simple merge

diff --cc base/applications/wordpad/wordpad.rbuild
Simple merge

diff --cc boot/freeldr/bootsect/fat.asm
Simple merge

diff --cc boot/freeldr/freeldr.rbuild
Simple merge

diff --cc boot/freeldr/freeldr/arch/i386/fathelp.asm
Simple merge

diff --cc boot/freeldr/freeldr/freeldr.rbuild
Simple merge

diff --cc boot/freeldr/freeldr/setupldr.rbuild
Simple merge

diff --cc config.template.rbuild
Simple merge

diff --cc dll/3rdparty/libtiff/libtiff.rbuild
Simple merge

diff --cc dll/cpl/desk/appearance.c
Simple merge

diff --cc dll/cpl/desk/draw.c
Simple merge

diff --cc dll/cpl/desk/preview.c
Simple merge

diff --cc dll/cpl/desk/theme.c
Simple merge

diff --cc dll/cpl/desk/theme.h
Simple merge

diff --cc dll/ntdll/def/ntdll.pspec
Simple merge

diff --cc dll/ntdll/dispatch/amd64/stubs.c
index 0000000,fe7b4a7..fe7b4a7
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/ntdll/dispatch/amd64/stubs.c
+++ b/dll/ntdll/dispatch/amd64/stubs.c

diff --cc dll/ntdll/ntdll.rbuild
Simple merge

diff --cc dll/ntdll/rtl/libsupp.c
Simple merge

diff --cc dll/win32/advapi32/sec/misc.c
Simple merge

diff --cc dll/win32/dhcpcsvc/dhcp/adapter.c
Simple merge

diff --cc dll/win32/dhcpcsvc/dhcp/dhclient.c
Simple merge

diff --cc dll/win32/dhcpcsvc/include/rosdhcp.h
Simple merge

diff --cc dll/win32/gdiplus/gdiplus.rbuild
Simple merge

diff --cc dll/win32/msvcrt/msvcrt.spec
Simple merge

diff --cc dll/win32/netcfgx/netcfgx.c
Simple merge

diff --cc dll/win32/netcfgx/precomp.h
Simple merge

diff --cc drivers/network/ndis/include/protocol.h
Simple merge

diff --cc drivers/network/ndis/ndis/buffer.c
Simple merge

diff --cc drivers/network/ndis/ndis/miniport.c
Simple merge

diff --cc drivers/network/ndis/ndis/protocol.c
Simple merge

diff --cc drivers/network/tcpip/datalink/lan.c
Simple merge

diff --cc drivers/storage/ide/atapi/atapi.rbuild
Simple merge

diff --cc drivers/wdm/audio/filters/kmixer/pin.c
Simple merge

diff --cc include/crt/_mingw.h
Simple merge

diff --cc include/crt/setjmp.h
Simple merge

diff --cc include/crt/stdlib.h
Simple merge

diff --cc include/ddk/ndis.h
Simple merge

diff --cc include/ddk/ntddk.h
Simple merge

diff --cc include/ddk/ntifs.h
Simple merge

diff --cc include/ddk/wdm.h
Simple merge

diff --cc include/ndk/amd64/asm.h
Simple merge

diff --cc include/ndk/arch/mmtypes.h
Simple merge

diff --cc include/ndk/mmtypes.h
Simple merge

diff --cc include/ndk/rtlfuncs.h
Simple merge

diff --cc include/psdk/ntddndis.h
Simple merge

diff --cc include/xdk/fsrtlfuncs.h
Simple merge

diff --cc include/xdk/iofuncs.h
Simple merge

diff --cc include/xdk/rtlfuncs.h
Simple merge

diff --cc lib/3rdparty/bzip2/bzip2.rbuild
Simple merge

diff --cc lib/3rdparty/bzip2/unbzip2.spec
index 0000000,68d5d87..68d5d87
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/3rdparty/bzip2/unbzip2.spec
+++ b/lib/3rdparty/bzip2/unbzip2.spec

diff --cc lib/3rdparty/mingw/crtexe.c
Simple merge

diff --cc lib/3rdparty/mingw/gs_support.c
Simple merge

diff --cc lib/3rdparty/mingw/mingw.rbuild
Simple merge

diff --cc lib/3rdparty/mingw/reactos.diff
Simple merge

diff --cc lib/pseh/amd64/framebased.S
index 0000000,401d922..401d922
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/pseh/amd64/framebased.S
+++ b/lib/pseh/amd64/framebased.S

diff --cc lib/pseh/pseh.rbuild
Simple merge

diff --cc lib/rtl/avlsupp.c
index 0000000,50b96ce..50b96ce
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/rtl/avlsupp.c
+++ b/lib/rtl/avlsupp.c

diff --cc lib/rtl/avltable.c
index 0000000,acfb99d..acfb99d
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/rtl/avltable.c
+++ b/lib/rtl/avltable.c

diff --cc lib/rtl/generictable.c
Simple merge

diff --cc lib/rtl/rtl.rbuild
Simple merge

diff --cc lib/rtl/rtlavl.h
index 0000000,7088ce1..7088ce1
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/rtl/rtlavl.h
+++ b/lib/rtl/rtlavl.h

diff --cc lib/sdk/crt/crt.rbuild
Simple merge

diff --cc lib/sdk/crt/except/amd64/chkstk_asm.s
Simple merge

diff --cc lib/sdk/crt/except/amd64/seh.s
Simple merge

diff --cc lib/sdk/crt/libcntpr.rbuild
Simple merge

diff --cc lib/sdk/crt/math/amd64/alldiv.S
index 0000000,831ef50..831ef50
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/alldiv.S
+++ b/lib/sdk/crt/math/amd64/alldiv.S

diff --cc lib/sdk/crt/math/amd64/atan.S
index 0000000,3ba1949..3ba1949
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/atan.S
+++ b/lib/sdk/crt/math/amd64/atan.S

diff --cc lib/sdk/crt/math/amd64/atan2.S
index 0000000,7cd29b9..7cd29b9
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/atan2.S
+++ b/lib/sdk/crt/math/amd64/atan2.S

diff --cc lib/sdk/crt/math/amd64/ceil.S
index 0000000,dbee413..dbee413
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/ceil.S
+++ b/lib/sdk/crt/math/amd64/ceil.S

diff --cc lib/sdk/crt/math/amd64/ceilf.S
index 0000000,e3a948f..e3a948f
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/ceilf.S
+++ b/lib/sdk/crt/math/amd64/ceilf.S

diff --cc lib/sdk/crt/math/amd64/exp.S
index 0000000,ca3dc99..ca3dc99
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/exp.S
+++ b/lib/sdk/crt/math/amd64/exp.S

diff --cc lib/sdk/crt/math/amd64/fabs.S
index 0000000,e58b960..e58b960
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/fabs.S
+++ b/lib/sdk/crt/math/amd64/fabs.S

diff --cc lib/sdk/crt/math/amd64/floor.S
index 0000000,f1c3b93..f1c3b93
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/floor.S
+++ b/lib/sdk/crt/math/amd64/floor.S

diff --cc lib/sdk/crt/math/amd64/floorf.S
index 0000000,e2d0220..e2d0220
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/floorf.S
+++ b/lib/sdk/crt/math/amd64/floorf.S

diff --cc lib/sdk/crt/math/amd64/fmod.S
index 0000000,4ca67f5..4ca67f5
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/fmod.S
+++ b/lib/sdk/crt/math/amd64/fmod.S

diff --cc lib/sdk/crt/math/amd64/fmodf.S
index 0000000,e109c38..e109c38
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/fmodf.S
+++ b/lib/sdk/crt/math/amd64/fmodf.S

diff --cc lib/sdk/crt/math/amd64/ldexp.S
index 0000000,d026562..d026562
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/ldexp.S
+++ b/lib/sdk/crt/math/amd64/ldexp.S

diff --cc lib/sdk/crt/math/amd64/log.S
index 0000000,9fa0276..9fa0276
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/log.S
+++ b/lib/sdk/crt/math/amd64/log.S

diff --cc lib/sdk/crt/math/amd64/log10.S
index 0000000,007f0d8..007f0d8
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/log10.S
+++ b/lib/sdk/crt/math/amd64/log10.S

diff --cc lib/sdk/crt/math/amd64/pow.S
index 0000000,3798880..3798880
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/pow.S
+++ b/lib/sdk/crt/math/amd64/pow.S

diff --cc lib/sdk/crt/math/amd64/sqrt.S
index 0000000,758d876..758d876
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/sqrt.S
+++ b/lib/sdk/crt/math/amd64/sqrt.S

diff --cc lib/sdk/crt/math/amd64/sqrtf.S
index 0000000,a4ee3fa..a4ee3fa
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/sqrtf.S
+++ b/lib/sdk/crt/math/amd64/sqrtf.S

diff --cc lib/sdk/crt/math/amd64/tan.S
index 0000000,a7c66d0..a7c66d0
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/amd64/tan.S
+++ b/lib/sdk/crt/math/amd64/tan.S

diff --cc lib/sdk/crt/math/cos.c
index 0000000,1e7d8c4..1e7d8c4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/cos.c
+++ b/lib/sdk/crt/math/cos.c

diff --cc lib/sdk/crt/math/cosf.c
index 0000000,d2329c7..d2329c7
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/cosf.c
+++ b/lib/sdk/crt/math/cosf.c

diff --cc lib/sdk/crt/math/i386/ceilf.S
index 0000000,9eee272..9eee272
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/i386/ceilf.S
+++ b/lib/sdk/crt/math/i386/ceilf.S

diff --cc lib/sdk/crt/math/i386/floorf.S
index 0000000,eec073b..eec073b
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/i386/floorf.S
+++ b/lib/sdk/crt/math/i386/floorf.S

diff --cc lib/sdk/crt/math/i386/fmodf.c
index 0000000,761f56c..761f56c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/i386/fmodf.c
+++ b/lib/sdk/crt/math/i386/fmodf.c

diff --cc lib/sdk/crt/math/i386/sqrtf.c
index 0000000,ff36a34..ff36a34
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/i386/sqrtf.c
+++ b/lib/sdk/crt/math/i386/sqrtf.c

diff --cc lib/sdk/crt/math/sin.c
index 0000000,da69573..da69573
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/sin.c
+++ b/lib/sdk/crt/math/sin.c

diff --cc lib/sdk/crt/math/sinf.c
index 0000000,1069dcf..1069dcf
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/math/sinf.c
+++ b/lib/sdk/crt/math/sinf.c

diff --cc lib/sdk/crt/setjmp/amd64/setjmp.s
index 0000000,56459ae..56459ae
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s
+++ b/lib/sdk/crt/setjmp/amd64/setjmp.s

diff --cc media/doc/README.WINE
Simple merge

diff --cc ntoskrnl/ex/amd64/fastinterlck.c
index 0000000,b9ca32a..b9ca32a
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ex/amd64/fastinterlck.c
+++ b/ntoskrnl/ex/amd64/fastinterlck.c

diff --cc ntoskrnl/ex/init.c
Simple merge

diff --cc ntoskrnl/include/internal/amd64/ke.h
Simple merge

diff --cc ntoskrnl/include/internal/amd64/mm.h
Simple merge

diff --cc ntoskrnl/include/internal/ke.h
Simple merge

diff --cc ntoskrnl/include/internal/mm.h
Simple merge

diff --cc ntoskrnl/include/internal/ntoskrnl.h
Simple merge

diff --cc ntoskrnl/include/internal/rtl.h
Simple merge

diff --cc ntoskrnl/io/iomgr/arcname.c
Simple merge

diff --cc ntoskrnl/kd/amd64/kd.c
index 0000000,74694d2..74694d2
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/kd/amd64/kd.c
+++ b/ntoskrnl/kd/amd64/kd.c

diff --cc ntoskrnl/kd/amd64/kdmemsup.c
index 0000000,75f19a1..75f19a1
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/kd/amd64/kdmemsup.c
+++ b/ntoskrnl/kd/amd64/kdmemsup.c

diff --cc ntoskrnl/kd64/kddata.c
Simple merge

diff --cc ntoskrnl/kdbg/amd64/dis-asm.h
index 0000000,4052910..4052910
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/kdbg/amd64/dis-asm.h
+++ b/ntoskrnl/kdbg/amd64/dis-asm.h

diff --cc ntoskrnl/kdbg/amd64/i386-dis.c
index 0000000,ac9d153..ac9d153
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/kdbg/amd64/i386-dis.c
+++ b/ntoskrnl/kdbg/amd64/i386-dis.c

diff --cc ntoskrnl/kdbg/amd64/kdb.c
index 0000000,239902f..239902f
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/kdbg/amd64/kdb.c
+++ b/ntoskrnl/kdbg/amd64/kdb.c

diff --cc ntoskrnl/kdbg/amd64/kdb_help.S
index 0000000,eb77701..eb77701
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/kdbg/amd64/kdb_help.S
+++ b/ntoskrnl/kdbg/amd64/kdb_help.S

diff --cc ntoskrnl/ke/amd64/boot.S
index 0000000,f1715c6..f1715c6
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/boot.S
+++ b/ntoskrnl/ke/amd64/boot.S

diff --cc ntoskrnl/ke/amd64/context.c
index 0000000,239a697..239a697
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/context.c
+++ b/ntoskrnl/ke/amd64/context.c

diff --cc ntoskrnl/ke/amd64/cpu.c
index 0000000,90a6b2c..90a6b2c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/cpu.c
+++ b/ntoskrnl/ke/amd64/cpu.c

diff --cc ntoskrnl/ke/amd64/ctxswitch.S
index 0000000,61ce147..61ce147
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/ctxswitch.S
+++ b/ntoskrnl/ke/amd64/ctxswitch.S

diff --cc ntoskrnl/ke/amd64/except.c
index 0000000,9784559..9784559
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/except.c
+++ b/ntoskrnl/ke/amd64/except.c

diff --cc ntoskrnl/ke/amd64/interrupt.c
index 0000000,171ebda..171ebda
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/interrupt.c
+++ b/ntoskrnl/ke/amd64/interrupt.c

diff --cc ntoskrnl/ke/amd64/irql.c
index 0000000,53dcd38..53dcd38
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/irql.c
+++ b/ntoskrnl/ke/amd64/irql.c

diff --cc ntoskrnl/ke/amd64/kiinit.c
index 0000000,d270463..d270463
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/kiinit.c
+++ b/ntoskrnl/ke/amd64/kiinit.c

diff --cc ntoskrnl/ke/amd64/spinlock.c
index 0000000,9c485fd..9c485fd
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/spinlock.c
+++ b/ntoskrnl/ke/amd64/spinlock.c

diff --cc ntoskrnl/ke/amd64/stubs.c
index 0000000,bfc4545..bfc4545
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/stubs.c
+++ b/ntoskrnl/ke/amd64/stubs.c

diff --cc ntoskrnl/ke/amd64/thrdini.c
index 0000000,616cd30..616cd30
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/thrdini.c
+++ b/ntoskrnl/ke/amd64/thrdini.c

diff --cc ntoskrnl/ke/amd64/trap.S
index 0000000,532f6bb..532f6bb
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ke/amd64/trap.S
+++ b/ntoskrnl/ke/amd64/trap.S

diff --cc ntoskrnl/mm/ARM3/i386/init.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/miarm.h
Simple merge

diff --cc ntoskrnl/mm/ARM3/miavl.h
index 0000000,8b0ce6d..8b0ce6d
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/mm/ARM3/miavl.h
+++ b/ntoskrnl/mm/ARM3/miavl.h

diff --cc ntoskrnl/mm/ARM3/mminit.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/pagfault.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/pfnlist.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/procsup.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/sysldr.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/syspte.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/vadnode.c
index 0000000,c6f8be6..c6f8be6
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/mm/ARM3/vadnode.c
+++ b/ntoskrnl/mm/ARM3/vadnode.c

diff --cc ntoskrnl/mm/ARM3/virtual.c
Simple merge

diff --cc ntoskrnl/mm/amd64/init.c
index 0000000,eab7192..eab7192
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/mm/amd64/init.c
+++ b/ntoskrnl/mm/amd64/init.c

diff --cc ntoskrnl/mm/amd64/page.c
index 0000000,d9830b4..d9830b4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/mm/amd64/page.c
+++ b/ntoskrnl/mm/amd64/page.c

diff --cc ntoskrnl/mm/i386/page.c
Simple merge

diff --cc ntoskrnl/mm/marea.c
Simple merge

diff --cc ntoskrnl/mm/mmfault.c
Simple merge

diff --cc ntoskrnl/mm/mminit.c
Simple merge

diff --cc ntoskrnl/mm/procsup.c
Simple merge

diff --cc ntoskrnl/mm/rmap.c
Simple merge

diff --cc ntoskrnl/mm/section.c
Simple merge

diff --cc ntoskrnl/mm/virtual.c
Simple merge

diff --cc ntoskrnl/ntoskrnl-generic.rbuild
Simple merge

diff --cc ntoskrnl/ps/amd64/psctx.c
index 0000000,57ed4da..57ed4da
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ps/amd64/psctx.c
+++ b/ntoskrnl/ps/amd64/psctx.c

diff --cc ntoskrnl/rtl/libsupp.c
Simple merge