diff --git a/[refs] b/[refs] index 386402339ebf..843e84606770 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3c1cfcdb43e023ab1b1c7a555cd9e929026500a +refs/heads/master: b070989aeb47ccdfe56d95e046bd317baa47f4fa diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fe643e7b9df6..f13d107f9b1a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7305,6 +7305,7 @@ W: http://user-mode-linux.sourceforge.net S: Maintained F: Documentation/virtual/uml/ F: arch/um/ +F: arch/x86/um/ F: fs/hostfs/ F: fs/hppfs/