diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 19:14:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 19:14:17 -0400 |
commit | e4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb (patch) | |
tree | 1a8d89561fa5b231202d5287acc2683eccadee7f /MAINTAINERS | |
parent | 9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa (diff) | |
parent | 2671717265ae6e720a9ba5f13fbec3a718983b65 (diff) |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
intel_idle: native hardware cpuidle driver for latest Intel processors
ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING
sched: clarify commment for TS_POLLING
ACPI: allow a native cpuidle driver to displace ACPI
cpuidle: make cpuidle_curr_driver static
cpuidle: add cpuidle_unregister_driver() error check
cpuidle: fail to register if !CONFIG_CPU_IDLE
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 33047a605438..13608bd2e791 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2887,6 +2887,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git | |||
2887 | S: Maintained | 2887 | S: Maintained |
2888 | F: drivers/input/ | 2888 | F: drivers/input/ |
2889 | 2889 | ||
2890 | INTEL IDLE DRIVER | ||
2891 | M: Len Brown <lenb@kernel.org> | ||
2892 | L: linux-pm@lists.linux-foundation.org | ||
2893 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git | ||
2894 | S: Supported | ||
2895 | F: drivers/idle/intel_idle.c | ||
2896 | |||
2890 | INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) | 2897 | INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) |
2891 | M: Maik Broemme <mbroemme@plusserver.de> | 2898 | M: Maik Broemme <mbroemme@plusserver.de> |
2892 | L: linux-fbdev@vger.kernel.org | 2899 | L: linux-fbdev@vger.kernel.org |