diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-06 22:56:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-06 22:56:04 -0400 |
| commit | f21fec96ead90eae7bcb3c847e8115c119c5dc62 (patch) | |
| tree | d60a74cc16aab57f5c8a4a496f0c6e9f33848d45 /MAINTAINERS | |
| parent | a0421da44fc8dcb94aad8889dae285f7ee923f80 (diff) | |
| parent | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI & Power Management patches from Len Brown:
"Two fixes for cpuidle merge-window changes, plus a URL fix in
MAINTAINERS"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
MAINTAINERS: Update git url for ACPI
cpuidle: Fix panic in CPU off-lining with no idle driver
ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0a2e44ce077..2dcfca85063 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -228,7 +228,7 @@ M: Len Brown <lenb@kernel.org> | |||
| 228 | L: linux-acpi@vger.kernel.org | 228 | L: linux-acpi@vger.kernel.org |
| 229 | W: http://www.lesswatts.org/projects/acpi/ | 229 | W: http://www.lesswatts.org/projects/acpi/ |
| 230 | Q: http://patchwork.kernel.org/project/linux-acpi/list/ | 230 | Q: http://patchwork.kernel.org/project/linux-acpi/list/ |
| 231 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git | 231 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux |
| 232 | S: Supported | 232 | S: Supported |
| 233 | F: drivers/acpi/ | 233 | F: drivers/acpi/ |
| 234 | F: drivers/pnp/pnpacpi/ | 234 | F: drivers/pnp/pnpacpi/ |