Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

[linux-2.6.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5d56a3fd0de6b9d4d8acc0a26495bd24c489d31f..57af07cf7e682e77de69d96587b0ca315ea611a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,11 @@ modules.builtin
 /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
 #
@@ -57,6 +62,7 @@ modules.builtin
 include/config
 include/linux/version.h
 include/generated
+arch/*/include/generated
 
 # stgit generated dirs
 patches-*