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 [PATCH] uml: arch/um/scripts/Makefile.rules - remove duplicated code 2005-12-18 11:19:44 -08:00
sys-i386 [PATCH] uml: fix usage of kernel_errno in place of errno 2006-02-24 14:31:37 -08:00
sys-ia64 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sys-ppc [PATCH] uml: stack dump fix 2005-05-28 16:46:13 -07:00
sys-x86_64 [PATCH] uml: initialize process FP registers properly 2006-02-07 16:12:32 -08:00
config.release Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
defconfig [PATCH] uml: skas0 - separate kernel address space on stock hosts 2005-07-07 18:23:44 -07:00
Kconfig [PATCH] uml: arch Kconfig menu cleanups 2006-01-18 19:20:21 -08:00
Kconfig.char [PATCH] uml: Rename Kconfig files to be like the other arches 2005-09-05 00:06:19 -07:00
Kconfig.debug [PATCH] uml: workaround GDB problems on debugging 2005-09-05 00:06:20 -07:00
Kconfig.i386 [PATCH] uml: arch Kconfig menu cleanups 2006-01-18 19:20:21 -08:00
Kconfig.net [PATCH] uml: Rename Kconfig files to be like the other arches 2005-09-05 00:06:19 -07:00
Kconfig.scsi [PATCH] uml: Rename Kconfig files to be like the other arches 2005-09-05 00:06:19 -07:00
Kconfig.x86_64 [PATCH] uml: fix "reuse i386 cpu optimizations" 2005-10-30 17:37:16 -08:00
Makefile kbuild: change kbuild to not rely on incorrect GNU make behavior 2006-03-06 00:09:51 +01:00
Makefile-i386 [PATCH] uml: fixups for "reuse i386 cpu-specific tuning" 2005-11-13 18:14:14 -08:00
Makefile-ia64 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-os-Linux Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-ppc Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-skas [PATCH] uml makefiles sanitized 2005-09-29 08:46:26 -07:00
Makefile-tt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-x86_64 [PATCH] uml: fix dynamic linking on some 64-bit distros 2005-12-18 11:19:44 -08:00