linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
include/linux/device.h between commit 4f3549d72d1b ("Driver core: Add
offline/online device operations") from the pm tree and commit
bfd63cd24df6 ("driver core: device.h: fix doc compilation warnings") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/device.h
index eeb3331,9d4835a..0000000
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@@ -655,8 -650,7 +657,9 @@@ struct acpi_dev_node 
   * @release:	Callback to free the device after all references have
   * 		gone away. This should be set by the allocator of the
   * 		device (i.e. the bus driver that discovered the device).
+  * @iommu_group: IOMMU group the device belongs to.
 + * @offline_disabled: If set, the device is permanently online.
 + * @offline:	Set after successful invocation of bus type's .offline().
   *
   * At the lowest level, every device in a Linux system is represented by an
   * instance of struct device. The device structure contains the information

Attachment: pgp00000.pgp
Description: PGP signature