diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /scripts/.gitignore | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'scripts/.gitignore')
| -rw-r--r-- | scripts/.gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index 09e2406f3b78..b939fbd01195 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Generated files | 2 | # Generated files |
| 3 | # | 3 | # |
| 4 | ihex2fw | ||
| 5 | conmakehash | 4 | conmakehash |
| 6 | kallsyms | 5 | kallsyms |
| 7 | pnmtologo | 6 | pnmtologo |