summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/arm-smmu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 00:47:40 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 00:47:40 +0200
commit06b77b97338e906e8af73a9b5f97b9162aac239d (patch)
treefc4fc5c5153dc5a1979e7d46b08dea20054a1d9e /drivers/iommu/arm-smmu.c
parentMerge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentmce: Panic when a core has reached a timeout (diff)
downloadlinux-06b77b97338e906e8af73a9b5f97b9162aac239d.tar.xz
linux-06b77b97338e906e8af73a9b5f97b9162aac239d.zip
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 RAS changes from Ingo Molnar: "Improve mcheck device initialization and bootstrap robustness" * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: mce: Panic when a core has reached a timeout x86/mce: Improve mcheck_init_device() error handling
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
0 files changed, 0 insertions, 0 deletions