• Linus Torvalds's avatar
    Merge branch 'x86-platform-for-linus' of... · b4c6e2ea
    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:
      x86, earlyprintk: Move mrst early console to platform/ and fix a typo
      x86, apbt: Setup affinity for apb timers acting as per-cpu timer
      ce4100: Add errata fixes for UART on CE4100
      x86: platform: Move iris to x86/platform where it belongs
      x86, mrst: Check platform_device_register() return code
      x86/platform: Add Eurobraille/Iris power off support
      x86, mrst: Add explanation for using 1960 as the year offset for vrtc
      x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"
      x86, mrst: The shutdown for MRST requires the SCU IPC mechanism
      x86: Ce4100: Add reboot_fixup() for CE4100
      ce4100: Add PCI register emulation for CE4100
      x86: Add CE4100 platform support
      x86: mrst: Set vRTC's IRQ to level trigger type
      x86: mrst: Add audio driver bindings
      rtc: Add drivers/rtc/rtc-mrst.c
      x86: mrst: Add vrtc driver which serves as a wall clock device
      x86: mrst: Add Moorestown specific reboot/shutdown support
      x86: mrst: Parse SFI timer table for all timer configs
      x86/mrst: Add SFI platform device parsing code
    b4c6e2ea
fixmap.h 6.92 KB