From 46946ba5cf2cfef4397ecdf149418cd45e275fa9 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Fri, 9 Dec 2011 20:22:04 +0200
Subject: [PATCH] --- yaml --- r: 281342 b: refs/heads/master c:
 3e39e66e5d1dcdf2e5bf027835dc98f4231ac30b h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99961a08421a..0ad9ce91eefb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b02a17ee5cd5d200dbe4a285a4e750f70884967
+refs/heads/master: 3e39e66e5d1dcdf2e5bf027835dc98f4231ac30b
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index d6c09f3dcaab..ebe4dc7deafb 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -6410,7 +6410,7 @@ S:	Odd Fixes
 F:	drivers/staging/winbond/
 
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
-M:	Arnaud Patard <apatard@mandriva.com>
+M:	Arnaud Patard <arnaud.patard@rtp-net.org>
 S:	Odd Fixes
 F:	drivers/staging/xgifb/