diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 01:10:38 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 01:10:38 +0100 |
commit | b7f077d7bc28649f6bd369fadec01219e725a9c6 (patch) | |
tree | 4e8f0959a8e522452ff8117c232f277b14e7bf07 /fs/ufs | |
parent | Merge branch 'dcache-word-accesses' (diff) | |
parent | x86/iommu/intel: Increase the number of iommus supported to MAX_IO_APICS (diff) | |
download | linux-b7f077d7bc28649f6bd369fadec01219e725a9c6.tar.xz linux-b7f077d7bc28649f6bd369fadec01219e725a9c6.zip |
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core/iommu changes for v3.4 from Ingo Molnar
* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/iommu/intel: Increase the number of iommus supported to MAX_IO_APICS
x86/iommu/intel: Fix identity mapping for sandy bridge
Diffstat (limited to 'fs/ufs')
0 files changed, 0 insertions, 0 deletions