diff options
| author | James Morris <jmorris@namei.org> | 2008-09-21 17:41:56 -0700 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-21 17:41:56 -0700 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /arch/blackfin/include/asm/.gitignore | |
| parent | f058925b201357fba48d56cc9c1719ae274b2022 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | talos-obmc-linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.gz talos-obmc-linux-ab2b49518e743962f71b94246855c44ee9cf52cc.zip | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/blackfin/include/asm/.gitignore')
| -rw-r--r-- | arch/blackfin/include/asm/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/.gitignore b/arch/blackfin/include/asm/.gitignore new file mode 100644 index 000000000000..7858564a4466 --- /dev/null +++ b/arch/blackfin/include/asm/.gitignore @@ -0,0 +1 @@ ++mach |
