linux/arch/m68k
Linus Torvalds 821f3eff7c Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: introduce ccflags-y, asflags-y and ldflags-y
  kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
  kbuild: enable use of AFLAGS and CFLAGS on commandline
  kbuild: enable 'make AFLAGS=...' to add additional options to AS
  kbuild: fix AFLAGS use in h8300 and m68knommu
  kbuild: check for wrong use of CFLAGS
  kbuild: enable 'make CFLAGS=...' to add additional options to CC
  kbuild: fix up CFLAGS usage
  kbuild: make modpost detect unterminated device id lists
  kbuild: call export_report from the Makefile
  kbuild: move Kai Germaschewski to CREDITS
  kconfig/menuconfig: distinguish between selected-by-another options and comments
  kconfig: tristate choices with mixed tristate and boolean values
  include/linux/Kbuild: remove duplicate entries
  kbuild: kill backward compatibility checks
  kbuild: kill EXTRA_ARFLAGS
  kbuild: fix documentation in makefiles.txt
  kbuild: call make once for all targets when O=.. is used
  kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
  kbuild: update _shipped files for kconfig syntax cleanup
  ...

Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
2007-10-16 11:23:06 -07:00
..
amiga SPIN_LOCK_UNLOCKED cleanup in arch/m68k 2007-05-07 12:12:59 -07:00
apollo m68k: missing __init 2007-07-20 08:24:49 -07:00
atari Atari keyboard: incorporate additional review comments 2007-10-15 13:08:55 -07:00
bvme6000 m68k: missing __init 2007-07-20 08:24:49 -07:00
configs [PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken 2005-06-12 20:43:22 -07:00
fpsp040 [PATCH] Add wording to m68k .S files to help clarify license info 2006-02-11 21:41:11 -08:00
hp300 IRQ: Use the new typedef for interrupt handler function pointers 2006-10-09 12:19:47 +01:00
ifpsp060 [PATCH] m68k: convert thread flags to use bit fields 2005-11-13 18:14:14 -08:00
kernel Consolidate PTRACE_DETACH 2007-10-16 09:42:49 -07:00
lib missing exports of csum_... 2007-07-17 11:01:07 -07:00
mac m68k: missing __init 2007-07-20 08:24:49 -07:00
math-emu Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mm During VM oom condition, kill all threads in process group 2007-10-16 09:42:52 -07:00
mvme16x m68k: missing __init 2007-07-20 08:24:49 -07:00
mvme147 m68k: missing __init 2007-07-20 08:24:49 -07:00
q40 m68k: missing __init 2007-07-20 08:24:49 -07:00
sun3 m68k: missing __init 2007-07-20 08:24:49 -07:00
sun3x m68k: missing __init 2007-07-20 08:24:49 -07:00
tools/amiga Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
defconfig [PATCH] M68k: Update defconfigs 2005-06-12 20:43:21 -07:00
Kconfig m68k: exclude more unbuildable drivers 2007-07-20 08:24:49 -07:00
Kconfig.debug Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile kbuild: enable 'make CFLAGS=...' to add additional options to CC 2007-10-14 22:21:35 +02:00