diff options
| author |  Johannes Berg <johannes.berg@intel.com>
| 2017-10-06 11:46:32 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com>
| 2017-10-06 11:46:55 +0200 |
| commit | 753d179ad001b25425beb977d00f2531540e7d42 (patch) | |
| tree | de61b9e3c86b71e9a654cea002b188f90b1f8ef6 /Documentation/driver-api | |
| parent | cfg80211/nl80211: add a port authorized event (diff) | |
| parent | net/ipv6: remove unused err variable on icmpv6_push_pending_frames (diff) | |
| download | linux-753d179ad001b25425beb977d00f2531540e7d42.tar.gz linux-753d179ad001b25425beb977d00f2531540e7d42.tar.bz2 linux-753d179ad001b25425beb977d00f2531540e7d42.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'Documentation/driver-api')
| -rw-r--r-- | Documentation/driver-api/pm/devices.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/driver-api/pm/devices.rst b/Documentation/driver-api/pm/devices.rst index bedd32388dac..a0dc2879a152 100644 --- a/Documentation/driver-api/pm/devices.rst +++ b/Documentation/driver-api/pm/devices.rst @@ -675,7 +675,7 @@ sub-domain of the parent domain. Support for power domains is provided through the :c:member:`pm_domain` field of |struct device|. This field is a pointer to an object of type -|struct dev_pm_domain|, defined in :file:`include/linux/pm.h``, providing a set +|struct dev_pm_domain|, defined in :file:`include/linux/pm.h`, providing a set of power management callbacks analogous to the subsystem-level and device driver callbacks that are executed for the given device during all power transitions, instead of the respective subsystem-level callbacks. Specifically, if a |