diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-23 12:47:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-23 12:47:09 +0200 |
| commit | 4d7bceca46f2565b4c36adde22697c357ab267d5 (patch) | |
| tree | 043a74ee7b80d2b0b6e01d1c3ff133fc3001b9bf /MAINTAINERS | |
| parent | c6555be617cd60ed57d210017a99164dda78435e (diff) | |
| parent | d5a30458a90597915977f06e79406b664a41b8ac (diff) | |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 70eef8a9ae17..846ccb7d849f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1960,7 +1960,7 @@ F: lib/kobj* DRM DRIVERS M: David Airlie <airlied@linux.ie> -L: dri-devel@lists.sourceforge.net +L: dri-devel@lists.freedesktop.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git S: Maintained F: drivers/gpu/drm/ @@ -4802,12 +4802,11 @@ F: drivers/s390/crypto/ S390 ZFCP DRIVER M: Christof Schmitt <christof.schmitt@de.ibm.com> -M: Martin Peschke <mp3@de.ibm.com> +M: Swen Schillig <swen@vnet.ibm.com> M: linux390@de.ibm.com L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported -F: Documentation/s390/zfcpdump.txt F: drivers/s390/scsi/zfcp_* S390 IUCV NETWORK LAYER |