Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  MAINTAINERS: update AVR32 and AT32AP maintainers

diff --combined MAINTAINERS
index d2dcef7,782f11e..1b9bcda
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1345,16 -1345,18 +1345,18 @@@ F:   drivers/auxdisplay
  F:    include/linux/cfag12864b.h
  
  AVR32 ARCHITECTURE
- M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
+ M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
+ M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
  W:    http://www.atmel.com/products/AVR32/
  W:    http://avr32linux.org/
  W:    http://avrfreaks.net/
- S:    Supported
+ S:    Maintained
  F:    arch/avr32/
  
  AVR32/AT32AP MACHINE SUPPORT
- M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
- S:    Supported
+ M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
+ M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
+ S:    Maintained
  F:    arch/avr32/mach-at32ap/
  
  AX.25 NETWORK LAYER
@@@ -6434,9 -6436,8 +6436,9 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
 +M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6466,12 -6467,6 +6468,12 @@@ S:    Maintaine
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
 +USB/IP DRIVERS
 +M:    Matt Mooney <mfm@muteddisk.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/usbip/
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -6501,9 -6496,8 +6503,9 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
 +M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*