tree 8b42bb624869aae84977b7990a7ef37d67959476
parent 7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3
parent 087052b02f42b50316c6e4d7f2d8dfba3de6fc2e
author Linus Torvalds <torvalds@linux-foundation.org> 1228794626 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228794626 -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: fix default_spin_lock_flags() prototype
  AMD IOMMU: __unmap_single: check for bad_dma_address instead of 0
  AMD IOMMU: fix WARN_ON in dma_ops unmap path
  AMD IOMMU: fix typo in comment
  AMD IOMMU: fix loop counter in free_pagetable function
  AMD IOMMU: fix iommu_map_page function