X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=98c324b07a164913d171d4ef6d07592940b8facf;hb=dc522adbee91dd17fa31f8e8cf72673fe0e8370e;hp=0b415248ae252b0706f16e3e5cb85e721e0b14d0;hpb=4d429480352c63db2228489f0db9fd381cdc3c9c;p=~andy%2Flinux diff --git a/MAINTAINERS b/MAINTAINERS index 0b415248ae2..98c324b07a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2245,10 +2245,10 @@ F: drivers/gpu/drm/ F: include/drm/ INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) -M: Chris Wilson +M: Keith Packard 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/ickle/drm-intel.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git S: Supported F: drivers/gpu/drm/i915 F: include/drm/i915* @@ -5592,10 +5592,11 @@ M: James Morris M: Eric Paris L: selinux@tycho.nsa.gov (subscribers-only, general discussion) W: http://selinuxproject.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git +T: git git://git.infradead.org/users/eparis/selinux.git S: Supported F: include/linux/selinux* F: security/selinux/ +F: scripts/selinux/ APPARMOR SECURITY MODULE M: John Johansen