From: Linus Torvalds Date: Sat, 18 Aug 2007 16:30:07 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: v2.6.23-rc4~133 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=edd5f25f7475013b44f7942bb3b25022792a9c9d;hp=-c;p=cascardo%2Flinux.git Merge git://git./linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Check return code on failed alloc [CIFS] Update CIFS project web site [CIFS] Fix hang in find_writable_file --- edd5f25f7475013b44f7942bb3b25022792a9c9d diff --combined MAINTAINERS index e4dde7f1f8d2,24c119407f72..371fe67a4eef --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -97,12 -97,6 +97,12 @@@ M: philb@gnu.or L: netdev@vger.kernel.org S: Maintained +3C59X NETWORK DRIVER +P: Steffen Klassert +M: klassert@mathematik.tu-chemnitz.de +L: netdev@vger.kernel.org +S: Maintained + 3CR990 NETWORK DRIVER P: David Dillow M: dave@thedillows.org @@@ -393,6 -387,21 +393,6 @@@ P: Jaya Kuma M: jayalk@intworks.biz S: Maintained -ARM26 ARCHITECTURE -P: Ian Molton -M: spyro@f2s.com -S: Maintained - -ARM26/ARCHIMEDES -P: Ian Molton -M: spyro@f2s.com -S: Maintained - -ARM26/A5000 -P: John Appleby -M: john@dnsworld.co.uk -S: Maintained - ARM MFM AND FLOPPY DRIVERS P: Ian Molton M: spyro@f2s.com @@@ -618,15 -627,6 +618,15 @@@ W: http://sourceforge.net/projects/acpi W: http://xf.iksaif.net/acpi4asus S: Maintained +ASYNCHRONOUS TRANSFERS/TRANSFORMS API +P: Dan Williams +M: dan.j.williams@intel.com +P: Shannon Nelson +M: shannon.nelson@intel.com +L: linux-kernel@vger.kernel.org +W: http://sourceforge.net/projects/xscaleiop +S: Supported + ATA OVER ETHERNET DRIVER P: Ed L. Cashin M: ecashin@coraid.com @@@ -679,7 -679,7 +679,7 @@@ S: Maintaine AUDIT SUBSYSTEM P: David Woodhouse M: dwmw2@infradead.org -L: linux-audit@redhat.com +L: linux-audit@redhat.com (subscribers-only) W: http://people.redhat.com/sgrubb/audit/ T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git S: Maintained @@@ -771,14 -771,6 +771,14 @@@ L: uclinux-dist-devel@blackfin.uclinux. W: http://blackfin.uclinux.org S: Supported +BLACKFIN WATCHDOG DRIVER +P: Mike Frysinger +M: michael.frysinger@analog.com +M: vapier.adi@gmail.com +L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) +W: http://blackfin.uclinux.org +S: Supported + BAYCOM/HDLCDRV DRIVERS FOR AX.25 P: Thomas Sailer M: t.sailer@alumni.ethz.ch @@@ -1009,7 -1001,7 +1009,7 @@@ P: Steve Frenc M: sfrench@samba.org L: linux-cifs-client@lists.samba.org L: samba-technical@lists.samba.org - W: http://us1.samba.org/samba/Linux_CIFS_client.html + W: http://linux-cifs.samba.org/ T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git S: Supported @@@ -1292,13 -1284,11 +1292,13 @@@ M: tori@unhappy.mine.n L: netdev@vger.kernel.org S: Maintained -DMA GENERIC MEMCPY SUBSYSTEM +DMA GENERIC OFFLOAD ENGINE SUBSYSTEM P: Shannon Nelson M: shannon.nelson@intel.com +P: Dan Williams +M: dan.j.williams@intel.com L: linux-kernel@vger.kernel.org -S: Maintained +S: Supported DME1737 HARDWARE MONITOR DRIVER P: Juerg Haefliger @@@ -1975,12 -1965,6 +1975,12 @@@ M: shannon.nelson@intel.co L: linux-kernel@vger.kernel.org S: Supported +INTEL IOP-ADMA DMA DRIVER +P: Dan Williams +M: dan.j.williams@intel.com +L: linux-kernel@vger.kernel.org +S: Supported + INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT P: Deepak Saxena M: dsaxena@plexity.net @@@ -2187,8 -2171,6 +2187,8 @@@ W: http://www.kerneljanitors.org S: Maintained KERNEL NFSD +P: J. Bruce Fields +M: bfields@fieldses.org P: Neil Brown M: neilb@suse.de L: nfs@lists.sourceforge.net @@@ -3357,14 -3339,6 +3357,14 @@@ M: thomas@winischhofer.ne W: http://www.winischhofer.at/linuxsisusbvga.shtml S: Maintained +SLAB ALLOCATOR +P: Christoph Lameter +M: clameter@sgi.com +P: Pekka Enberg +M: penberg@cs.helsinki.fi +L: linux-mm@kvack.org +S: Maintained + SMC91x ETHERNET DRIVER P: Nicolas Pitre M: nico@cam.org @@@ -3692,9 -3666,11 +3692,9 @@@ W: http://www.auk.cx/tms380tr S: Maintained TULIP NETWORK DRIVER -P: Valerie Henson -M: val@nmt.edu L: tulip-users@lists.sourceforge.net W: http://sourceforge.net/projects/tulip/ -S: Maintained +S: Orphan TUN/TAP driver P: Maxim Krasnyansky @@@ -3777,7 -3753,7 +3777,7 @@@ L: linux-usb-devel@lists.sourceforge.ne W: http://www.linux-usb.org/gadget S: Maintained -USB HID/HIDBP DRIVERS +USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) P: Jiri Kosina M: jkosina@suse.cz L: linux-usb-devel@lists.sourceforge.net