Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  drivers/base/node.c: fix compilation error with older versions of gcc
  uio: documentation fixups
  device.h: Fix struct member documentation

diff --combined include/linux/device.h
index 52b3a41,2b88320..3136ede
--- 1/include/linux/device.h
--- 2/include/linux/device.h
+++ b/include/linux/device.h
@@@ -69,7 -69,7 +69,7 @@@ extern void bus_remove_file(struct bus_
   * @resume:   Called to bring a device on this bus out of sleep mode.
   * @pm:               Power management operations of this bus, callback the specific
   *            device driver's pm-ops.
-  * @iommu_ops   IOMMU specific operations for this bus, used to attach IOMMU
+  * @iommu_ops:  IOMMU specific operations for this bus, used to attach IOMMU
   *              driver implementations to a bus and allow the driver to do
   *              bus-specific setup
   * @p:                The private data of the driver core, only the driver core can
@@@ -682,11 -682,6 +682,11 @@@ static inline bool device_async_suspend
        return !!dev->power.async_suspend;
  }
  
 +static inline void pm_suspend_ignore_children(struct device *dev, bool enable)
 +{
 +      dev->power.ignore_children = enable;
 +}
 +
  static inline void device_lock(struct device *dev)
  {
        mutex_lock(&dev->mutex);