From: David S. Miller Date: Mon, 13 Apr 2009 21:41:05 +0000 (-0700) Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ X-Git-Tag: upstream/snapshot3+hdmi~18712^2~210 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83400207a07584539366f6859362db6872809a12;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: MAINTAINERS --- 83400207a07584539366f6859362db6872809a12 diff --cc MAINTAINERS index 686b3dd,ca2997a..abedca5 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3176,14 -3912,26 +3912,19 @@@ NETWORK BLOCK DEVICE (NBD P: Paul Clements M: Paul.Clements@steeleye.com S: Maintained + F: Documentation/blockdev/nbd.txt + F: drivers/block/nbd.c + F: include/linux/nbd.h -NETWORK DEVICE DRIVERS -P: Jeff Garzik -M: jgarzik@pobox.com -L: netdev@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git -S: Maintained -F: drivers/net/ - NETWORKING [GENERAL] -P: Networking Team -M: netdev@vger.kernel.org +P: David S. Miller +M: davem@davemloft.net L: netdev@vger.kernel.org W: http://linux-net.osdl.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git S: Maintained + F: net/ + F: include/net/ NETWORKING [IPv4/IPv6] P: David S. Miller