git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
b12b8c1
..
1b9bcda
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-1345,16
+1345,18
@@
F: drivers/auxdisplay/
F: include/linux/cfag12864b.h
AVR32 ARCHITECTURE
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/
W: http://www.atmel.com/products/AVR32/
W: http://avr32linux.org/
W: http://avrfreaks.net/
-S:
Support
ed
+S:
Maintain
ed
F: arch/avr32/
AVR32/AT32AP MACHINE SUPPORT
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
F: arch/avr32/mach-at32ap/
AX.25 NETWORK LAYER
@@
-2291,8
+2293,7
@@
F: drivers/scsi/eata_pio.*
EBTABLES
M: Bart De Schuymer <bart.de.schuymer@pandora.be>
EBTABLES
M: Bart De Schuymer <bart.de.schuymer@pandora.be>
-L: ebtables-user@lists.sourceforge.net
-L: ebtables-devel@lists.sourceforge.net
+L: netfilter-devel@vger.kernel.org
W: http://ebtables.sourceforge.net/
S: Maintained
F: include/linux/netfilter_bridge/ebt_*.h
W: http://ebtables.sourceforge.net/
S: Maintained
F: include/linux/netfilter_bridge/ebt_*.h
@@
-6435,8
+6436,9
@@
S: Maintained
F: drivers/usb/misc/rio500*
USB EHCI DRIVER
F: drivers/usb/misc/rio500*
USB EHCI DRIVER
+M: Alan Stern <stern@rowland.harvard.edu>
L: linux-usb@vger.kernel.org
L: linux-usb@vger.kernel.org
-S:
Orphan
+S:
Maintained
F: Documentation/usb/ehci.txt
F: drivers/usb/host/ehci*
F: Documentation/usb/ehci.txt
F: drivers/usb/host/ehci*
@@
-6466,6
+6468,12
@@
S: Maintained
F: Documentation/hid/hiddev.txt
F: drivers/hid/usbhid/
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
USB ISP116X DRIVER
M: Olav Kongas <ok@artecdesign.ee>
L: linux-usb@vger.kernel.org
@@
-6495,8
+6503,9
@@
S: Maintained
F: sound/usb/midi.*
USB OHCI DRIVER
F: sound/usb/midi.*
USB OHCI DRIVER
+M: Alan Stern <stern@rowland.harvard.edu>
L: linux-usb@vger.kernel.org
L: linux-usb@vger.kernel.org
-S:
Orphan
+S:
Maintained
F: Documentation/usb/ohci.txt
F: drivers/usb/host/ohci*
F: Documentation/usb/ohci.txt
F: drivers/usb/host/ohci*