Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --combined Documentation/kernel-parameters.txt
index 899650c20cc2637c15bb5f98be91df39fc803a2a,f2e1e7fc0ffd9cf462a2adb85e4269fc28e671a8..e0f346d201edb70fae654c55f6be842c4465a5ff
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -294,7 -294,9 +294,9 @@@ and is between 256 and 4096 characters
                        Possible values are:
                        isolate - enable device isolation (each device, as far
                                  as possible, will get its own protection
-                                 domain)
+                                 domain) [default]
+                       share - put every device behind one IOMMU into the
+                               same protection domain
                        fullflush - enable flushing of IO/TLB entries when
                                    they are unmapped. Otherwise they are
                                    flushed before they will be reused, which
@@@ -1193,8 -1195,8 +1195,8 @@@
                        it is equivalent to "nosmp", which also disables
                        the IO APIC.
  
 -      max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
 -                      equal to this physical address is ignored.
 +      max_addr=nn[KMG]        [KNL,BOOT,ia64] All physical memory greater than
 +                      or equal to this physical address is ignored.
  
        max_luns=       [SCSI] Maximum number of LUNs to probe.
                        Should be between 1 and 2^32-1.
@@@ -1294,9 -1296,6 +1296,9 @@@
  
        mga=            [HW,DRM]
  
 +      min_addr=nn[KMG]        [KNL,BOOT,ia64] All physical memory below this
 +                      physical address is ignored.
 +
        mminit_loglevel=
                        [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
                        parameter allows control of the logging verbosity for