summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-09 21:34:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 21:34:25 +0100
commitf974a8ec96571535ee07880a023bcce0e3f2c76b (patch)
tree5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /.gitignore
parentc0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff)
parent4ed47896935573c8423d05bddda3f269d6e6c613 (diff)
downloadop-kernel-dev-f974a8ec96571535ee07880a023bcce0e3f2c76b.zip
op-kernel-dev-f974a8ec96571535ee07880a023bcce0e3f2c76b.tar.gz
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 090b293..9bb1cb6 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
*~
\#*#
OpenPOWER on IntegriCloud