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 M: Helge Deller +M: "James E.J. Bottomley" 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