Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fixes from Matt Fleming:

 * WARN_ON(!spin_is_locked()) always triggers on non-SMP machines.
   Swap it for the more canonical lockdep_assert_held() which always
   does the right thing - Guenter Roeck

 * Assign the correct value to efi.runtime_version on arm64 so that all
   the runtime services can be invoked - Semen Protsenko

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 17 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-iommu b/Documentation/ABI/testing/sysfs-class-iommu
new file mode 100644
index 000000000000..6d0a1b4be82d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-iommu
@@ -0,0 +1,17 @@
+What:           /sys/class/iommu/<iommu>/devices/
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                IOMMU drivers are able to link devices managed by a
+                given IOMMU here to allow association of IOMMU to
+                device.
+
+What:           /sys/devices/.../iommu
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                IOMMU drivers are able to link the IOMMU for a
+                given device here to allow association of device to
+                IOMMU.