Merge branch 'merge' into next

Merge the binutils and kexec fixes.