What is the difference between osmosis and diffusion?

Osmosis is the movement of water molecules form a higher water potential to a lower water potential through a semi-permeable membrane whist diffusion is the movement of molecules from a region of higher molecular concentration to a region of lower molecular concentratuion until equilibrim is reached