NHL lockout ends with deal