| commit | 1053e6bba091d9d18797f7789df6a7ef8735f20c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 21 Oct 2010 19:49:15 +0000 (21 12:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 21 Oct 2010 19:49:15 +0000 (21 12:49 -0700) | ||
| tree | 192792603c380dc99d46039d74199e1a6e48dfaa | treesnapshot (tar.gz zip) |
| parent | a8fe1500986c32b46b36118aa250f6badca11bfc | commitdiff |
| parent | 3d8a1a6a8af910cc2da566080d111e062a124ba6 | commitdiff |
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
* '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