Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem

This commit is contained in:
Brian Behlendorf 2010-01-08 11:40:01 -08:00
commit 6037f5f124
7 changed files with 57 additions and 0 deletions

49
.gitignore vendored Normal file
View File

@ -0,0 +1,49 @@
#
# N.B.
# This is the toplevel .gitignore file.
# This is not the place for entries that are specific to
# a subdirectory. Instead add those files to the
# .gitignore file in that subdirectory.
#
# N.B.
# Please use 'git ls-files -i --exclude-standard'
# command after changing this file, to see if there are
# any tracked files which get ignored after the change.
#
# Normal rules
#
*.[oa]
*.ko
*.lo
*.la
*.mod.c
*~
*.swp
.*.cmd
.deps
.libs
.DS_Store
modules.order
Makefile
#
# Top level generated files specific to this top level dir
#
/Makefile
/config.log
/config.status
/libtool
/zfs_config.h
/zfs.spec
/zfs-modules.spec
/stamp-h1
/.script-config
#
# Top level generic files
#
!.gitignore
tags
TAGS
cscope.*

1
cmd/zdb/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/zdb

1
cmd/zfs/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/zfs

1
cmd/zinject/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/zinject

1
cmd/zpool/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/zpool

1
cmd/ztest/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/ztest

3
module/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/.tmp_versions
/Module.markers
/Module.symvers