diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-13 15:52:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-13 15:52:26 +1000 |
| commit | e23e315ac3e382b4ff164df2b9c9fcb70f04ed02 (patch) | |
| tree | a61a22ec89b825c38e7b8cd73939350081fd1265 /MAINTAINERS | |
| parent | 2d9430cb55b43a77c5054e3041bdd8f7692d7020 (diff) | |
| parent | e1077ef3b2751766c4437e2f974e3d7372742d0d (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 6f2a4f34b51a..49cb40ef11c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3007,6 +3007,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 @@ -5068,6 +5074,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 @@ -6039,6 +6051,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 |