Linus Torvalds 1347a2cebc 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		2012-05-28 10:32:28 -07:00
..
drivers	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-05-23 09:01:41 -07:00
include	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-05-23 18:11:45 -07:00
os-Linux	um: Remove unused variables	2012-05-21 21:09:32 +02:00
scripts
sys-ia64
sys-ppc
.gitignore
defconfig	um: Remove CONFIG_IRQ_RELEASE_METHOD	2012-05-21 21:09:37 +02:00
Kconfig.char
Kconfig.common	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-24 13:29:46 -07:00
Kconfig.debug
Kconfig.net
Kconfig.rest
Kconfig.um	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Makefile	kbuild: link of vmlinux moved to a script	2012-05-05 21:19:33 +02:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas