Merge branch 'stable/for-jens-3.13-take-two' of...

Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into for-linus