Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 22fb8fa..9bb1cb6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,10 +12,12 @@
 *.s
 *.ko
 *.so
+*.so.dbg
 *.mod.c
 *.i
 *.lst
 *.symtypes
+*.order
 
 #
 # Top-level generic files
@@ -24,7 +26,9 @@ tags
 TAGS
 vmlinux*
 !vmlinux.lds.S
+!vmlinux.lds.h
 System.map
+Module.markers
 Module.symvers
 !.gitignore
 
@@ -38,6 +42,7 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 include/linux/utsrelease.h
+include/linux/bounds.h
 
 # stgit generated dirs
 patches-*
@@ -48,6 +53,8 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
 
 *.orig
-*.rej
+*~
+\#*#