Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next

Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile

Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile
a20cc76b · Joerg Roedel · bb590c90 · a4188bee · 1d7f449c · cd70d465
Commit a20cc76b authored 10 years ago by Joerg Roedel
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/mfd/samsung/s2mps13.h
+++ b/include/linux/mfd/samsung/s2mps13.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/printk.h
+++ b/include/linux/printk.h