Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  alpha: fix build after vmlinux.lds.S cleanup
  mips: fix build of vmlinux.lds

diff --cc arch/alpha/kernel/vmlinux.lds.S
index 2906665,55c3b23..ecf4d48
--- 1/arch/alpha/kernel/vmlinux.lds.S
--- 2/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@@ -1,6 -1,6 +1,7 @@@
  #include <asm-generic/vmlinux.lds.h>
+ #include <asm/thread_info.h>
  #include <asm/page.h>
 +#include <asm/thread_info.h>
  
  OUTPUT_FORMAT("elf64-alpha")
  OUTPUT_ARCH(alpha)