diff --git a/[refs] b/[refs]
index 698f7e975579..76b4f8f439e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03315b59165ee2049a4b903a1b0b8bf673d701fa
+refs/heads/master: 3b2a8c8f3c65c08bd737b30d3ceee732ed84813a
diff --git a/trunk/.gitignore b/trunk/.gitignore
index de6344e15706..efab0ebec859 100644
--- a/trunk/.gitignore
+++ b/trunk/.gitignore
@@ -36,6 +36,7 @@ modules.builtin
 #
 tags
 TAGS
+linux
 vmlinux
 vmlinuz
 System.map
diff --git a/trunk/arch/um/.gitignore b/trunk/arch/um/.gitignore
new file mode 100644
index 000000000000..a73d3a1cc746
--- /dev/null
+++ b/trunk/arch/um/.gitignore
@@ -0,0 +1,3 @@
+kernel/config.c
+kernel/config.tmp
+kernel/vmlinux.lds