What is the difference between diffusion and osmosis?

Diffusion is a passive process whereby molecules move from areas of high to areas of low concentration, down the concentration gradient. Osmosis is also a passive process however only refers to movement of water across a partially permeable membrane.