I was offered tuition + an "instructional assistantship" for one year - I emailed the graduate director, who said that more funding was "very likely" to be forthcoming (good news for us both!), but they were still working on the details.
Semper_ubi - if you don't mind sharing, when did you hear about Berkeley funding (and which program are you in)? I'm in Classics, and my acceptance email said that my funding offer wouldn't be nailed down until early March. I haven't heard anything since, although I have a friend who's been admitted to Berkeley's Ancient History program and offered funding already. Just wondering whether it's time to start freaking out!