From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 19:49:15 +0000 (-0700)
Subject: Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1053e6bba091d9d18797f7789df6a7ef8735f20c;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'core-iommu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/amd-iommu: Update copyright headers
  x86/amd-iommu: Reenable AMD IOMMU if it's mysteriously vanished over suspend
  AGP: Warn when GATT memory cannot be set to UC
  x86, GART: Disable GART table walk probes
  x86, GART: Remove superfluous AMD64_GARTEN
---

1053e6bba091d9d18797f7789df6a7ef8735f20c