summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-19 17:10:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-19 17:10:38 -0700
commitb7f077d7bc28649f6bd369fadec01219e725a9c6 (patch)
tree4e8f0959a8e522452ff8117c232f277b14e7bf07 /net/ipv4
parentb0e37d7ac6ba937c3776ff5111ff6a7fa832fb4f (diff)
parent1b198bb04ad72669d4bd6575fc9945ed595bfee0 (diff)
downloadlinux-b7f077d7bc28649f6bd369fadec01219e725a9c6.tar.bz2
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 'net/ipv4')
0 files changed, 0 insertions, 0 deletions