diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /.gitignore | |
parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3f8fb686b59c..27fd37621255 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -16,6 +16,7 @@ | |||
16 | # | 16 | # |
17 | # Top-level generic files | 17 | # Top-level generic files |
18 | # | 18 | # |
19 | tags | ||
19 | vmlinux* | 20 | vmlinux* |
20 | System.map | 21 | System.map |
21 | Module.symvers | 22 | Module.symvers |
@@ -30,3 +31,5 @@ include/linux/autoconf.h | |||
30 | include/linux/compile.h | 31 | include/linux/compile.h |
31 | include/linux/version.h | 32 | include/linux/version.h |
32 | 33 | ||
34 | # stgit generated dirs | ||
35 | patches-* | ||