diff --git a/[refs] b/[refs] index 20db4333e3ac..5330ef6cd042 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03b044cca18c7b3efd5a06fb5aacab5c6384c2fa +refs/heads/master: b15194b7076d6bb7b0b6f3efcb6a103e6cbcc5db diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4fb9017b4413..42471b830967 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6633,6 +6633,7 @@ F: drivers/media/video/zr364xx.c USER-MODE LINUX (UML) M: Jeff Dike +M: Richard Weinberger L: user-mode-linux-devel@lists.sourceforge.net L: user-mode-linux-user@lists.sourceforge.net W: http://user-mode-linux.sourceforge.net