Merge branch 'linus' into xen-64bit