From ceabafd82138676f9b18fc972ede8afc4c6788d5 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Tue, 4 Aug 2009 23:59:55 +0000
Subject: [PATCH] --- yaml --- r: 166955 b: refs/heads/master c:
 b882877082602bd2d9444069bae1926bf10ebe0d h: refs/heads/master i:   166953:
 4b6e1c78f212ff409ba2ec87b53f56021f5d936a   166951:
 de2690c855c5fd7da2ea3778e1a4b917331a5eee v: v3

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

diff --git a/[refs] b/[refs]
index a6fe62c2ec56..84a4242df25a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 530e949cc99ec6afba5207cbcd5f45c8cc8accc6
+refs/heads/master: b882877082602bd2d9444069bae1926bf10ebe0d
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index c450f3abb8c9..a51b896528c8 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3953,6 +3953,7 @@ F:	drivers/block/paride/
 PARISC ARCHITECTURE
 M:	Kyle McMartin <kyle@mcmartin.ca>
 M:	Helge Deller <deller@gmx.de>
+M:	"James E.J. Bottomley" <jejb@parisc-linux.org>
 L:	linux-parisc@vger.kernel.org
 W:	http://www.parisc-linux.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git