Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:51:54 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:51:54 +0000 (10:51 -0700)
commit0d9df2515dbceb67d343c0f10fd3ff218380d524
tree9b0f96173e1f63eacb72d7a527177771e6ff46a1
parentcce1d9f23213f3a8a43b6038df84a665aa8d8612
parentde078ef55c74d02ee93d44513da5ee88a089d71d
Merge git://git./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
arch/alpha/kernel/vmlinux.lds.S