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 /firmware/.gitignore | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'firmware/.gitignore')
| -rw-r--r-- | firmware/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/firmware/.gitignore b/firmware/.gitignore index f89a21fffbf1..d9c69017bc9a 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore | |||
| @@ -3,3 +3,4 @@ | |||
| 3 | *.bin | 3 | *.bin |
| 4 | *.csp | 4 | *.csp |
| 5 | *.dsp | 5 | *.dsp |
| 6 | ihex2fw | ||