diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:32:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:32:51 +1100 |
| commit | e6bd479f11cd8325ab41c8ee511d00b9324d9f87 (patch) | |
| tree | d59fd2150262532381070656aba06c7535ca6617 /MAINTAINERS | |
| parent | dbe1a6281f7c3c460b60253b75ab9447f478fb1f (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (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 67641d223658..4ed8d77f0052 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3201,6 +3201,12 @@ L: linux-serial@vger.kernel.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 @@ -5368,6 +5374,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 @@ -6352,6 +6364,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 |