Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts