Merge branch 'upstream/ticketlock-cleanup' of git://github.com/jsgf/linux-xen into...