• Linus Torvalds's avatar
    Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c945d022
    Linus Torvalds authored
    Pull x86 platform updates from Ingo Molnar:
     "Misc platform updates: SGI UV4 support additions, intel-mid Merrifield
      enhancements and purge of old code"
    
    * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
      x86/platform/UV/NMI: Fix uneccessary kABI breakage
      x86/platform/UV: Clean up the NMI code to match current coding style
      x86/platform/UV: Ensure uv_system_init is called when necessary
      x86/platform/UV: Initialize PCH GPP_D_0 NMI Pin to be NMI source
      x86/platform/UV: Verify NMI action is valid, default is standard
      x86/platform/UV: Add basic CPU NMI health check
      x86/platform/UV: Add Support for UV4 Hubless NMIs
      x86/platform/UV: Add Support for UV4 Hubless systems
      x86/platform/UV: Clean up the UV APIC code
      x86/platform/intel-mid: Move watchdog registration to arch_initcall()
      x86/platform/intel-mid: Don't shadow error code of mp_map_gsi_to_irq()
      x86/platform/intel-mid: Allocate RTC interrupt for Merrifield
      x86/ioapic: Return suitable error code in mp_map_gsi_to_irq()
      x86/platform/UV: Fix 2 socket config problem
      x86/platform/UV: Fix panic with missing UVsystab support
      x86/platform/intel-mid: Enable RTC on Intel Merrifield
      x86/platform/intel: Remove PMIC GPIO block support
      x86/platform/intel-mid: Make intel_scu_device_register() static
      x86/platform/intel-mid: Enable GPIO keys on Merrifield
      x86/platform/intel-mid: Get rid of duplication of IPC handler
      ...
    c945d022
io_apic.c 77.3 KB