Merge tag 'cris-for-linus' of git://jni.nu/cris

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 62b0cf496ebd7b1464e53831eeadd9c68409bff1..150a29f3cd334abcc1ba18618931d6391af09713 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2398,10 +2398,10 @@ F:      drivers/gpu/drm/
 F:     include/drm/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M:     Keith Packard <keithp@keithp.com>
+M:     Daniel Vetter <daniel.vetter@ffwll.ch>
 L:     intel-gfx@lists.freedesktop.org (subscribers-only)
 L:     dri-devel@lists.freedesktop.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
+T:     git git://people.freedesktop.org/~danvet/drm-intel
 S:     Supported
 F:     drivers/gpu/drm/i915
 F:     include/drm/i915*
@@ -7623,7 +7623,7 @@ XFS FILESYSTEM
 P:     Silicon Graphics Inc
 M:     Ben Myers <bpm@sgi.com>
 M:     Alex Elder <elder@kernel.org>
-M:     xfs-masters@oss.sgi.com
+M:     xfs@oss.sgi.com
 L:     xfs@oss.sgi.com
 W:     http://oss.sgi.com/projects/xfs
 T:     git git://oss.sgi.com/xfs/xfs.git