• Linus Torvalds's avatar
    Merge branch 'x86-fixes-for-linus' of... · b9836e08
    Linus Torvalds authored
    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: fix microcode driver newly spewing warnings
      x86, PAT: Remove page granularity tracking for vm_insert_pfn maps
      x86: disable X86_PTRACE_BTS for now
      x86, documentation: kernel-parameters replace X86-32,X86-64 with X86
      x86: pci-swiotlb.c swiotlb_dma_ops should be static
      x86, PAT: Remove duplicate memtype reserve in devmem mmap
      x86, PAT: Consolidate code in pat_x_mtrr_type() and reserve_memtype()
      x86, PAT: Changing memtype to WC ensuring no WB alias
      x86, PAT: Handle faults cleanly in set_memory_ APIs
      x86, PAT: Change order of cpa and free in set_memory_wb
      x86, CPA: Change idmap attribute before ioremap attribute setup
    b9836e08
ioremap.c 17.8 KB