Skip to content
  1. Sep 20, 2009
  2. Sep 19, 2009
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of... · 78f28b7c
      Linus Torvalds authored
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
        x86: Move get/set_wallclock to x86_platform_ops
        x86: platform: Fix section annotations
        x86: apic namespace cleanup
        x86: Distangle ioapic and i8259
        x86: Add Moorestown early detection
        x86: Add hardware_subarch ID for Moorestown
        x86: Add early platform detection
        x86: Move tsc_init to late_time_init
        x86: Move tsc_calibration to x86_init_ops
        x86: Replace the now identical time_32/64.c by time.c
        x86: time_32/64.c unify profile_pc
        x86: Move calibrate_cpu to tsc.c
        x86: Make timer setup and global variables the same in time_32/64.c
        x86: Remove mca bus ifdef from timer interrupt
        x86: Simplify timer_ack magic in time_32.c
        x86: Prepare unification of time_32/64.c
        x86: Remove do_timer hook
        x86: Add timer_init to x86_init_ops
        x86: Move percpu clockevents setup to x86_init_ops
        x86: Move xen_post_allocator_init into xen_pagetable_setup_done
        ...
      
      Fix up conflicts in arch/x86/include/asm/io_apic.h
      78f28b7c