From 5ac2b2f18aa345b2c39ebb85df4d7b2179e8e4cf Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 2 Aug 2012 01:00:47 +0200 Subject: [PATCH] --- yaml --- r: 321183 b: refs/heads/master c: b070989aeb47ccdfe56d95e046bd317baa47f4fa h: refs/heads/master i: 321181: f768b2ae137be5a0a600da09cb71b60bbba65bcf 321179: e302f4a7655e20b101010051b06d4c0236fe0211 321175: e8364a1a8c16e9df2ce98124e0595172b8f03b7f 321167: 54e13dd3d531ef266804175362f4669f3e02d879 321151: aa8baef48684dbb24a0ae200efa8492aedbdc318 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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/