I found that if I changed memory and then powered up the machine would lockup on resuming Windows.

Fix. Be sure to shutdown Windows (don't use the lid or power button) so the next boot is a full cold boot. This full shutdown must be done with the original memory.

That worked for me.