tree 9b0f96173e1f63eacb72d7a527177771e6ff46a1
parent cce1d9f23213f3a8a43b6038df84a665aa8d8612
parent de078ef55c74d02ee93d44513da5ee88a089d71d
author Linus Torvalds <torvalds@linux-foundation.org> 1253987514 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253987514 -0700

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