diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:45:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:45:20 +1100 |
| commit | 85f2e058be04463349f1cf85d7c0d9f6d7492826 (patch) | |
| tree | 1008bd85e2259a18c07c5fc1421a54223d12c2fd /MAINTAINERS | |
| parent | 4028d93b54ecdc17993d52ec284fe369d8d5f288 (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (diff) | |
Merge remote-tracking branch 'alacrity/linux-next'
Conflicts:
drivers/Makefile
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 7175bcb6bc84..0bdf6bdab69f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3386,6 +3386,12 @@ L: linux-serial@vger.kernel.org S: Maintained F: drivers/tty/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 @@ -5636,6 +5642,12 @@ F: drivers/tty/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 @@ -6631,6 +6643,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 |