Merge branch 'for-linus' into for-next

[linux-2.6-block.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2030c7a4d2f8c4d5d3764990c7b4a7b6855bb10b..70580bdd352ccfc5b30ce42c378da860fcfaaccd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,9 +32,9 @@
 *.lzo
 *.mod
 *.mod.c
+*.ns_deps
 *.o
 *.o.*
-*.order
 *.patch
 *.s
 *.so
@@ -46,6 +46,7 @@
 *.xz
 Module.symvers
 modules.builtin
+modules.order
 
 #
 # Top-level generic files