diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-15 18:23:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-15 18:23:12 +1100 |
| commit | 0d15a69f47721304a1de253b0c331f5c8d0e1539 (patch) | |
| tree | 6d0016acf120ec16ffe1859f9acbce6fa19b17b0 /MAINTAINERS | |
| parent | 3bd35fd6342b1d0bd20cd0d8028e95f8dd740ffb (diff) | |
| parent | 12bb12fac06d6212be9a5ed282c5670d4e90747f (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
drivers/staging/dabusb/dabusb.c
drivers/staging/dabusb/dabusb.h
drivers/staging/easycap/easycap_ioctl.c
drivers/staging/usbvideo/usbvideo.c
drivers/staging/usbvideo/vicam.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd29dd1fb598..eebbbfb0fa38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3611,12 +3611,6 @@ W: http://lse.sourceforge.net/kdump/ S: Maintained F: Documentation/kdump/ -KERNEL AUTOMOUNTER (AUTOFS) -M: "H. Peter Anvin" <hpa@zytor.com> -L: autofs@linux.kernel.org -S: Obsolete -F: drivers/staging/autofs/ - KERNEL AUTOMOUNTER v4 (AUTOFS4) M: Ian Kent <raven@themaw.net> L: autofs@linux.kernel.org |