From: Linus Torvalds Date: Tue, 9 Dec 2008 03:50:26 +0000 (-0800) Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.28-rc8~42 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=6f84b4dbe92e3ffb00f4d8cbe9a31b5be5ecd8ca 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 --- 6f84b4dbe92e3ffb00f4d8cbe9a31b5be5ecd8ca