Merge branch btrfs-master into for-linus

[sfrench/cifs-2.6.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 946c7ec5c922ff5bb02726144178f56f57c3378d..fb2190c61af0982ae9b8792b51d970bddaafdf5f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
 *.lst
 *.symtypes
 *.order
+modules.builtin
 *.elf
 *.bin
 *.gz
@@ -45,14 +46,8 @@ Module.symvers
 #
 # Generated include files
 #
-include/asm
-include/asm-*/asm-offsets.h
 include/config
-include/linux/autoconf.h
-include/linux/compile.h
 include/linux/version.h
-include/linux/utsrelease.h
-include/linux/bounds.h
 include/generated
 
 # stgit generated dirs