diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /.gitignore | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
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 | |||
| 26 | TAGS | 26 | TAGS |
| 27 | vmlinux* | 27 | vmlinux* |
| 28 | !vmlinux.lds.S | 28 | !vmlinux.lds.S |
| 29 | !vmlinux.lds.h | ||
| 29 | System.map | 30 | System.map |
| 30 | Module.markers | 31 | Module.markers |
| 31 | Module.symvers | 32 | Module.symvers |
| @@ -52,8 +53,8 @@ series | |||
| 52 | 53 | ||
| 53 | # cscope files | 54 | # cscope files |
| 54 | cscope.* | 55 | cscope.* |
| 56 | ncscope.* | ||
| 55 | 57 | ||
| 56 | *.orig | 58 | *.orig |
| 57 | *.rej | ||
| 58 | *~ | 59 | *~ |
| 59 | \#*# | 60 | \#*# |