From adafd2661eb1adc91bd0a399d0d96ffe0dceb68d Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@redhat.com>
Date: Wed, 30 May 2012 14:18:41 -0600
Subject: [PATCH] --- yaml --- r: 316578 b: refs/heads/master c:
 74416e1e07660798379ce10a210bf4fd35b84f9f h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/device.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9cf30b6187cb..1137e718564d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ebb9566007083c6fd92674996d2a0be2ea79745
+refs/heads/master: 74416e1e07660798379ce10a210bf4fd35b84f9f
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index 161d96241b1b..d0e4d99405ae 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -36,6 +36,7 @@ struct subsys_private;
 struct bus_type;
 struct device_node;
 struct iommu_ops;
+struct iommu_group;
 
 struct bus_attribute {
 	struct attribute	attr;
@@ -687,6 +688,7 @@ struct device {
 	const struct attribute_group **groups;	/* optional groups */
 
 	void	(*release)(struct device *dev);
+	struct iommu_group	*iommu_group;
 };
 
 /* Get the wakeup routines, which depend on struct device */