summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-23 11:53:03 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-23 11:53:03 +0200
commit009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch)
treef7d3e182407d2ebe50a9b8db6361ac910027a1cf /.gitignore
parent3711ccb07b7f0a13f4f1aa16a8fdca9c930f21ca (diff)
parent481c5346d0981940ee63037eb53e4e37b0735c10 (diff)
Merge branch 'linus' into x86/threadinfotip-x86-threadinfo-2008-06-23_09.53_Mon
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 090b293b8779..9bb1cb6d825d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ tags
TAGS
vmlinux*
!vmlinux.lds.S
+!vmlinux.lds.h
System.map
Module.markers
Module.symvers
@@ -52,8 +53,8 @@ series
# cscope files
cscope.*
+ncscope.*
*.orig
-*.rej
*~
\#*#