| commit | 1053e6bba091d9d18797f7789df6a7ef8735f20c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 12:49:15 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 12:49:15 2010 -0700 |
| tree | 192792603c380dc99d46039d74199e1a6e48dfaa | |
| parent | a8fe1500986c32b46b36118aa250f6badca11bfc [diff] | |
| parent | 3d8a1a6a8af910cc2da566080d111e062a124ba6 [diff] |
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/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