diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-14 18:31:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-14 18:31:08 +0200 |
| commit | 35f9162d67c3e20a82b4bd6ec538f3e9c14fb055 (patch) | |
| tree | 07417d2d6ece61884dcd262c18fbfbc6824c478d /kernel/debug/gdbstub.c | |
| parent | Linux 3.12-rc5 (diff) | |
| parent | Merge branch 'acpi-pci-hotplug' (diff) | |
| download | linux-35f9162d67c3e20a82b4bd6ec538f3e9c14fb055.tar.xz linux-35f9162d67c3e20a82b4bd6ec538f3e9c14fb055.zip | |
Merge tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki:
"These fix two recent bugs in ACPIPHP (ACPI-based PCI hotplug) and
update a bunch of web links and e-mail addresses in MAINTAINERS, docs
and Kconfig that either are stale or will expire soon.
Specifics:
- The WARN_ON() in acpiphp_enumerate_slots() triggers as a false
positive in some cases, so drop it.
- Add a missing pci_dev_put() to an error code path in
acpiphp_enumerate_slots().
- Replace my old e-mail address that's going to expire with a new
one.
- Update ACPI web links and git tree information in MAINTAINERS.
- Update links to the Linux-ACPI project's page in MAINTAINERS.
- Update some stale links and e-mail addresses under Documentation
and in the ACPI Kconfig file"
* tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()
ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()
ACPI / PM / Documentation: Replace outdated project links and addresses
MAINTAINERS / ACPI: Update links to the Linux-ACPI project web page
MAINTAINERS / ACPI: Update links and git tree information
MAINTAINERS / Documentation: Update Rafael's e-mail address
Diffstat (limited to 'kernel/debug/gdbstub.c')
0 files changed, 0 insertions, 0 deletions