tree 495eb1b7071a0890c1fa58c12139ebd6305e0e82
parent 90324cc1b11a211e37eabd8cb863e1a1561d6b1d
parent f7fc237e330deaaea4ba6726b603d4058d1e6b38
author Linus Torvalds <torvalds@linux-foundation.org> 1338226348 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1338226348 -0700

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild updates from Michal Marek.

Fixed up nontrivial merge conflict in Makefile as per Stephen Rothwell
and linux-next (and trivial arch/sparc/Makefile changes due to removed
sparc32 logic).

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  mips: Fix KBUILD_CPPFLAGS definition
  kbuild: fix ia64 link
  kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux
  kbuild: link of vmlinux moved to a script
  kbuild: refactor final link of sparc32
  kbuild: drop unused KBUILD_VMLINUX_OBJS from top-level Makefile
  kbuild: Makefile: remove unnecessary check for m68knommu ARCH