linux-stable/init
Linus Torvalds 81a07d7588 Merge branch 'x86-64'
* x86-64: (83 commits)
  [PATCH] x86_64: x86_64 stack usage debugging
  [PATCH] x86_64: (resend) x86_64 stack overflow debugging
  [PATCH] x86_64: msi_apic.c build fix
  [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs
  [PATCH] x86_64: Avoid broadcasting NMI IPIs
  [PATCH] x86_64: fix apic error on bootup
  [PATCH] x86_64: enlarge window for stack growth
  [PATCH] x86_64: Minor string functions optimizations
  [PATCH] x86_64: Move export symbols to their C functions
  [PATCH] x86_64: Standardize i386/x86_64 handling of NMI_VECTOR
  [PATCH] x86_64: Fix modular pc speaker
  [PATCH] x86_64: remove sys32_ni_syscall()
  [PATCH] x86_64: Do not use -ffunction-sections for modules
  [PATCH] x86_64: Add cpu_relax to apic_wait_icr_idle
  [PATCH] x86_64: adjust kstack_depth_to_print default
  [PATCH] i386/x86-64: adjust /proc/interrupts column headings
  [PATCH] x86_64: Fix race in cpu_local_* on preemptible kernels
  [PATCH] x86_64: Fix fast check in safe_smp_processor_id
  [PATCH] x86_64: x86_64 setup.c - printing cmp related boottime information
  [PATCH] i386/x86-64/ia64: Move polling flag into thread_info_status
  ...

Manual resolve of trivial conflict in arch/i386/kernel/Makefile
2006-06-26 10:51:09 -07:00
..
calibrate.c [PATCH] Platform SMIs and their interferance with tsc based delay calibration 2005-06-23 09:45:08 -07:00
do_mounts.c [MTD] Allow alternate JFFS2 mount variant for root filesystem. 2006-05-30 14:25:46 +02:00
do_mounts.h [PATCH] name_to_dev_t warning fix 2005-07-12 16:00:58 -07:00
do_mounts_devfs.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
do_mounts_initrd.c [PATCH] swsusp: userland interface 2006-03-23 07:38:07 -08:00
do_mounts_md.c [PATCH] md: remove personality numbering from md 2006-01-06 08:34:06 -08:00
do_mounts_rd.c [PATCH] s390: cleanup Kconfig 2006-01-06 08:33:53 -08:00
initramfs.c [PATCH] initramfs overwrite fix 2006-06-26 09:58:40 -07:00
Kconfig [PATCH] x86_64: Move VM86 config into arch/i386/Kconfig 2006-06-26 10:48:20 -07:00
main.c Merge branch 'x86-64' 2006-06-26 10:51:09 -07:00
Makefile kbuild: "PREEMPT" in UTS_VERSION 2005-07-14 20:18:07 +00:00
version.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00