diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:54:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:54:15 -0400 |
| commit | 35e51fe82ddcd8fb7f129d6dd8491c097d388665 (patch) | |
| tree | d6dd5e860c0e68a1af7976990c7d624e7362415d /MAINTAINERS | |
| parent | c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d (diff) | |
| parent | a0bfa1373859e9d11dc92561a8667588803e42d8 (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:
cpuidle: stop depending on pm_idle
x86 idle: move mwait_idle_with_hints() to where it is used
cpuidle: replace xen access to x86 pm_idle and default_idle
cpuidle: create bootparam "cpuidle.off=1"
mrst_pmu: driver for Intel Moorestown Power Management Unit
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6c84a219c83..07cfd8deaad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3367,6 +3367,12 @@ F: drivers/net/ixgb/ | |||
| 3367 | F: drivers/net/ixgbe/ | 3367 | F: drivers/net/ixgbe/ |
| 3368 | F: drivers/net/ixgbevf/ | 3368 | F: drivers/net/ixgbevf/ |
| 3369 | 3369 | ||
| 3370 | INTEL MRST PMU DRIVER | ||
| 3371 | M: Len Brown <len.brown@intel.com> | ||
| 3372 | L: linux-pm@lists.linux-foundation.org | ||
| 3373 | S: Supported | ||
| 3374 | F: arch/x86/platform/mrst/pmu.* | ||
| 3375 | |||
| 3370 | INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT | 3376 | INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT |
| 3371 | L: linux-wireless@vger.kernel.org | 3377 | L: linux-wireless@vger.kernel.org |
| 3372 | S: Orphan | 3378 | S: Orphan |