Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 25 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ce37c4b1ef94..4dcd2f1f14d6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -181,6 +181,12 @@ M:	bcrl@kvack.org
 L:      linux-aio@kvack.org
 S:      Supported
 
+ABIT UGURU HARDWARE MONITOR DRIVER
+P:      Hans de Goede
+M:      j.w.r.degoede@hhs.nl
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 ACENIC DRIVER
 P:      Jes Sorensen
 M:      jes@trained-monkey.org
@@ -568,6 +574,12 @@ L:	linuxppc-dev@ozlabs.org
 W:      http://www.penguinppc.org/ppc64/
 S:      Supported
 
+BROADCOM B44 10/100 ETHERNET DRIVER
+P:      Gary Zambrano
+M:      zambrano@broadcom.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 P:      Michael Chan
 M:      mchan@broadcom.com
@@ -1147,6 +1159,12 @@ L:	linux-hams@vger.kernel.org
 W:      http://www.nt.tuwien.ac.at/~kkudielk/Linux/
 S:      Maintained
 
+HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
+P:      HighPoint Linux Team
+M:      linux@highpoint-tech.com
+W:      http://www.highpoint-tech.com
+S:      Supported
+
 HIPPI
 P:      Jes Sorensen
 M:      jes@trained-monkey.org
@@ -2051,6 +2069,12 @@ M:      adaplas@pol.net
 L:      linux-fbdev-devel@lists.sourceforge.net
 S:      Maintained
 
+OPENCORES I2C BUS DRIVER
+P:      Peter Korsgaard
+M:      jacmet@sunsite.dk
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 P:      Mark Fasheh
 M:      mark.fasheh@oracle.com
@@ -2522,12 +2546,6 @@ M:	thomas@winischhofer.net
 W:      http://www.winischhofer.at/linuxsisusbvga.shtml
 S:      Maintained
 
-SMSC47M1 HARDWARE MONITOR DRIVER
-P:      Jean Delvare
-M:      khali@linux-fr.org
-L:      lm-sensors@lm-sensors.org
-S:      Odd Fixes
-
 SMB FILESYSTEM
 P:      Urban Widmark
 M:      urban@teststation.com
@@ -3140,12 +3158,6 @@ L:	wbsd-devel@list.drzeus.cx
 W:      http://projects.drzeus.cx/wbsd
 S:      Maintained
 
-W83L785TS HARDWARE MONITOR DRIVER
-P:      Jean Delvare
-M:      khali@linux-fr.org
-L:      lm-sensors@lm-sensors.org
-S:      Odd Fixes
-
 WATCHDOG DEVICE DRIVERS
 P:      Wim Van Sebroeck
 M:      wim@iguana.be
@@ -3185,7 +3197,7 @@ XFS FILESYSTEM
 P:      Silicon Graphics Inc
 M:      xfs-masters@oss.sgi.com
 M:      nathans@sgi.com
-L:      linux-xfs@oss.sgi.com
+L:      xfs@oss.sgi.com
 W:      http://oss.sgi.com/projects/xfs
 S:      Supported