Diffusion
The net movement of molecules from a region of their higher concentration to a region of their lower concentration down a concentration gradient, as a result of their random movement.
Osmosis
The diffusion of water molecules from a region of their higher concentration (dilute solution) to a region of their lower concentration (concentrated solution), through a partially permeable membrane.