aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-03-20 11:05:41 -0400
committerLen Brown <len.brown@intel.com>2007-03-20 11:05:41 -0400
commit54b8c39fbd76a7341b66e49de677ea366737fce7 (patch)
tree2a355e5daa966548034fe30f71fb9d9cc70403cf /MAINTAINERS
parent0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (diff)
parent0cd4554df0c261f7ba74786e471ccaa0e3725fb9 (diff)
Pull misc-for-upstream into release branch
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
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
3066S: Maintained 3066S: Maintained
3067 3067
3068SONY VAIO CONTROL DEVICE DRIVER 3068SONY VAIO CONTROL DEVICE DRIVER
3069P: Stelian Pop
3070M: stelian@popies.net
3071P: Mattia Dongili 3069P: Mattia Dongili
3072M: malattia@linux.it 3070M: malattia@linux.it
3073W: http://popies.net/sonypi/ 3071L: linux-acpi@vger.kernel.org
3072W: http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
3074S: Maintained 3073S: Maintained
3075 3074
3076SOUND 3075SOUND