Phase diagram of QCD from the lattice