diff options
author | Len Brown <len.brown@intel.com> | 2007-03-20 11:05:41 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-20 11:05:41 -0400 |
commit | 54b8c39fbd76a7341b66e49de677ea366737fce7 (patch) | |
tree | 2a355e5daa966548034fe30f71fb9d9cc70403cf /MAINTAINERS | |
parent | 0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (diff) | |
parent | 0cd4554df0c261f7ba74786e471ccaa0e3725fb9 (diff) |
Pull misc-for-upstream into release branch
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d8d5b917d1f..dd6978b1e8fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3066,11 +3066,10 @@ L: netdev@vger.kernel.org | |||
3066 | S: Maintained | 3066 | S: Maintained |
3067 | 3067 | ||
3068 | SONY VAIO CONTROL DEVICE DRIVER | 3068 | SONY VAIO CONTROL DEVICE DRIVER |
3069 | P: Stelian Pop | ||
3070 | M: stelian@popies.net | ||
3071 | P: Mattia Dongili | 3069 | P: Mattia Dongili |
3072 | M: malattia@linux.it | 3070 | M: malattia@linux.it |
3073 | W: http://popies.net/sonypi/ | 3071 | L: linux-acpi@vger.kernel.org |
3072 | W: http://www.linux.it/~malattia/wiki/index.php/Sony_drivers | ||
3074 | S: Maintained | 3073 | S: Maintained |
3075 | 3074 | ||
3076 | SOUND | 3075 | SOUND |