Diffusion: Diffusion is the movement of particles from an area of higher concentration to lower concentration. The overall effect is to equalize concentration throughout the medium.
Osmosis: Osmosis is the movement of solvent particles across a semipermeable membrane from a dilute solution into a concentrated solution.