Pull misc-for-upstream into release branch
authorLen Brown <len.brown@intel.com>
Tue, 20 Mar 2007 15:05:41 +0000 (11:05 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 20 Mar 2007 15:05:41 +0000 (11:05 -0400)
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 6d8d5b917d1fe0f4ff011d738ca9d13947521eb8,f3a79d4ef7fd612888411a137da3495ca59c504b..dd6978b1e8fbcbde19e874828a16bdb3100e6f7a
@@@ -3066,11 -3066,10 +3066,10 @@@ L:   netdev@vger.kernel.or
  S:    Maintained
  
  SONY VAIO CONTROL DEVICE DRIVER
- P:    Stelian Pop
- M:    stelian@popies.net
  P:    Mattia Dongili
  M:    malattia@linux.it
- W:    http://popies.net/sonypi/
+ L:    linux-acpi@vger.kernel.org
+ W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
  
  SOUND
@@@ -3103,9 -3102,6 +3102,9 @@@ TPM DEVICE DRIVE
  P:    Kylene Hall
  M:    kjhall@us.ibm.com
  W:    http://tpmdd.sourceforge.net
 +P:    Marcel Selhorst
 +M:    tpm@selhorst.net
 +W:    http://www.prosec.rub.de/tpm/
  L:    tpmdd-devel@lists.sourceforge.net
  S:    Maintained