diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 21:49:15 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 21:49:15 +0200 |
commit | 1053e6bba091d9d18797f7789df6a7ef8735f20c (patch) | |
tree | 192792603c380dc99d46039d74199e1a6e48dfaa /kernel/rcutree.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
parent | Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
download | linux-1053e6bba091d9d18797f7789df6a7ef8735f20c.tar.xz linux-1053e6bba091d9d18797f7789df6a7ef8735f20c.zip |
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
Diffstat (limited to 'kernel/rcutree.h')
0 files changed, 0 insertions, 0 deletions