The blaze broke out near Wrightwood on Saturday afternoon. Firefighters from Los Angeles and San Bernardino counties got help from the air with water-dropping helicopters and airplanes.
At one point, people living in the Pinon Hills area had to evacuate, but they've been allowed back home.
So far, there have been no reports of any damage or injuries. The cause is under investigation.