commit 9d674f2107b7dc801db9780f5f6b645f4905372f
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Jun 12 13:36:27 2014 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Jun 12 13:36:27 2014 +0200
tree 624465152808cdfff5a8c6ffae9fdee63056b1af
parent 9b758d4e293deb282dd4870503e4d2778cf69df0
parent 882d18a702c66404fcb62b84748f719f9b47441c

Merge branch 'acpi-hotplug'

* acpi-hotplug:
  ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges

Documentation/power/suspend-and-cpuhotplug.txt

diff --git a/Documentation/power/suspend-and-cpuhotplug.txt b/Documentation/power/suspend-and-cpuhotplug.txt
index e13dafc..2850df3 100644
--- a/Documentation/power/suspend-and-cpuhotplug.txt
+++ b/Documentation/power/suspend-and-cpuhotplug.txt
@@ -1,6 +1,6 @@
 Interaction of Suspend code (S3) with the CPU hotplug infrastructure
 
-     (C) 2011 Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
+     (C) 2011 - 2014 Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
 
 
 I. How does the regular CPU hotplug code differ from how the Suspend-to-RAM