tree c37f34eee23ae96c78f72e445ad20f8fbcab010e
parent 9f92f4719764acf1c9185a5958200887a43e3483
parent 73f56c0d35e6427081a4eabd620d8b8d8a35bd09
author Linus Torvalds <torvalds@linux-foundation.org> 1227149516 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1227149516 -0800

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: more general identifier for Phoenix BIOS
  AMD IOMMU: check for next_bit also in unmapped area
  AMD IOMMU: fix fullflush comparison length
  AMD IOMMU: enable device isolation per default
  AMD IOMMU: add parameter to disable device isolation
  x86, PEBS/DS: fix code flow in ds_request()
  x86: add rdtsc barrier to TSC sync check
  xen: fix scrub_page()
  x86: fix es7000 compiling
  x86, bts: fix unlock problem in ds.c
  x86, voyager: fix smp generic helper voyager breakage
  x86: move iomap.h to the new include location