Hold ALT/CMD and click on the line between the two layers in the layers palette.
Do the same to release the clipping mask.
This avoids using the menu system: Layer>Create/Release Clipping Mask or ctrl+alt/cmd+G.