linux/arch/um
Linus Torvalds 2e1ca21d46 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up
2006-03-25 08:48:48 -08:00
..
drivers [PATCH] uml: tidying COW code 2006-02-24 14:31:37 -08:00
include [PATCH] uml: fix ((unused)) attribute 2006-02-24 14:31:37 -08:00
kernel [PATCH] x86: SMP alternatives 2006-03-23 07:38:04 -08:00
os-Linux [PATCH] uml: os_connect_socket error path fixup 2006-02-24 14:31:37 -08:00
scripts
sys-i386 [PATCH] uml: fix usage of kernel_errno in place of errno 2006-02-24 14:31:37 -08:00
sys-ia64
sys-ppc
sys-x86_64
config.release
defconfig
Kconfig
Kconfig.char
Kconfig.debug
Kconfig.i386
Kconfig.net
Kconfig.scsi
Kconfig.x86_64
Makefile kbuild: change kbuild to not rely on incorrect GNU make behavior 2006-03-06 00:09:51 +01:00
Makefile-i386
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas
Makefile-tt
Makefile-x86_64