Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index 686b3dde93538dc0bce86a13e157d4204be29fa4,ca2997a45766adac94d6dc3c739bc425efaac45c..abedca58d8bd31b596eb8dc0736428982820a4c3
--- 1/MAINTAINERS
--- 2/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