Mike Guadango over at Freak Strength put together a nice video of an upper body/shoulder/neck area warmup.
Improve Shoulder & Upper Body Health NOW!
Full disclosure - Mike is my friend and my trainer. Also, this is the kind of workout prep he prescribes and does himself. Lots of movements, moderate to high reps, quality before intensity.