Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs

[linux-3.10.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index de6344e15706280de410cd83372f997720d0947a..57af07cf7e682e77de69d96587b0ca315ea611a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,19 +28,31 @@ modules.builtin
 *.gz
 *.bz2
 *.lzma
+*.xz
+*.lzo
 *.patch
 *.gcno
 
 #
 # Top-level generic files
 #
-tags
-TAGS
-vmlinux
-vmlinuz
-System.map
-Module.markers
-Module.symvers
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
+
+#
+# Debian directory (make deb-pkg)
+#
+/debian/
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
 !.gitignore
 !.mailmap
 
@@ -50,6 +62,7 @@ Module.symvers
 include/config
 include/linux/version.h
 include/generated
+arch/*/include/generated
 
 # stgit generated dirs
 patches-*