He tends to focus on one or the other at a time though.
edit: a month or two ago there was this huge increase in SpaceX development all of a sudden that has since dwindled. I wonder if that was Musk working on SpaceX but now back at Tesla? of course i could be way off base too ( FAA thorn in SpaceX's side etc )