Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / .gitignore

diff --git a/.gitignore b/.gitignore
index a232295b99ac87331f375ce17c7e9bba5ea46d58..090b293b87792a815cf51aeccb590ec37c90cfa3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,17 @@
 #
 .*
 *.o
+*.o.*
 *.a
 *.s
 *.ko
 *.so
+*.so.dbg
 *.mod.c
 *.i
 *.lst
 *.symtypes
+*.order
 
 #
 # Top-level generic files
@@ -24,7 +27,9 @@ TAGS
 vmlinux*
 !vmlinux.lds.S
 System.map
+Module.markers
 Module.symvers
+!.gitignore
 
 #
 # Generated include files
@@ -36,6 +41,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-*
@@ -49,3 +55,5 @@ cscope.*
 
 *.orig
 *.rej
+*~
+\#*#