• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 · ff1ea52f
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
      x86: fix APIC related bootup crash on Athlon XP CPUs
      time: add ADJ_OFFSET_SS_READ
      x86: export the symbol empty_zero_page on the 32-bit x86 architecture
      x86: fix kprobes_64.c inlining borkage
      pci: use pci=bfsort for HP DL385 G2, DL585 G2
      x86: correctly set UTS_MACHINE for "make ARCH=x86"
      lockdep: annotate do_debug() trap handler
      x86: turn off iommu merge by default
      x86: fix ACPI compile for LOCAL_APIC=n
      x86: printk kernel version in WARN_ON and other dump_stack users
      ACPI: Set max_cstate to 1 for early Opterons.
      x86: fix NMI watchdog & 'stopped time' problem
io_apic_32.c 69.9 KB