Yep, it was my plugins. Go here to find out how to deactivate your plugins from phpMyAdmin or from FTP.
Once I deactivated my plugins, I could access wp-admin again, and then I reactivated the plugins, and everything worked fine. Not sure why the plugins didn’t work when upgrading… strange.