sync with trunk r49322

svn path=/branches/cmake-bringup/; revision=49323

diff --cc drivers/storage/classpnp/class.spec
index 0000000,478f7dc..478f7dc
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/storage/classpnp/class.spec
+++ b/drivers/storage/classpnp/class.spec

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

diff --cc lib/drivers/sound/mmixer/sup.c
Simple merge

diff --cc lib/drivers/sound/mmixer/topology.c
Simple merge

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

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

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

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

diff --cc ntoskrnl/ntoskrnl.pspec
Simple merge

diff --cc subsystems/win32/win32k/ntuser/keyboard.c
Simple merge

diff --cc subsystems/win32/win32k/ntuser/message.c
Simple merge

diff --cc subsystems/win32/win32k/ntuser/monitor.c
Simple merge