diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
| commit | 6f99eec3dc2285abfb93631003f7e5cadf2eab0f (patch) | |
| tree | 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c /include/.gitignore | |
| parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
| parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
| download | talos-obmc-uboot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.gz talos-obmc-uboot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/.gitignore')
| -rw-r--r-- | include/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/.gitignore b/include/.gitignore index ab7d4c76f4..03a533ced4 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,5 +1,6 @@ /autoconf.mk* /asm +/asm-blackfin/arch /asm-ppc/arch /bmp_logo.h /config.h |
