diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:27:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:27:04 +1100 |
| commit | 01a0b0a4555806ad5753c4ec9b22783f20381a62 (patch) | |
| tree | 1519eb4ab0696c6673aeee6b948c6f60915a6b49 /MAINTAINERS | |
| parent | 28453b0dd37121d3ca47b105ff934e7f831c59a9 (diff) | |
| parent | e0a49cff52601056e49ec9235064b4726c70df52 (diff) | |
Merge remote branch 'alacrity/linux-next'
Conflicts:
include/linux/Kbuild
lib/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41bf488bfe24..4c10239d2744 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2876,6 +2876,12 @@ L: linux-mips@linux-mips.org S: Maintained F: drivers/serial/ioc3_serial.c +IOQ LIBRARY +M: Gregory Haskins <ghaskins@novell.com> +S: Maintained +F: include/linux/ioq.h +F: lib/ioq.c + IP MASQUERADING M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> S: Maintained @@ -4826,6 +4832,12 @@ F: drivers/serial/serial_lh7a40x.c F: drivers/usb/gadget/lh7a40* F: drivers/usb/host/ohci-lh7a40* +SHM-SIGNAL LIBRARY +M: Gregory Haskins <ghaskins@novell.com> +S: Maintained +F: include/linux/shm_signal.h +F: lib/shm_signal.c + SIMPLE FIRMWARE INTERFACE (SFI) M: Len Brown <lenb@kernel.org> L: sfi-devel@simplefirmware.org @@ -5725,6 +5737,19 @@ S: Maintained F: Documentation/fb/uvesafb.txt F: drivers/video/uvesafb.* +VBUS +M: Gregory Haskins <ghaskins@novell.com> +S: Maintained +F: include/linux/vbus* +F: drivers/vbus/* + +VBUS ETHERNET DRIVER +M: Gregory Haskins <ghaskins@novell.com> +S: Maintained +W: http://developer.novell.com/wiki/index.php/AlacrityVM +F: include/linux/venet.h +F: drivers/net/vbus-enet.c + VFAT/FAT/MSDOS FILESYSTEM M: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> S: Maintained |