NHL lockout ends