summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:11:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:11:48 +0200
commitbee8dddbfcb07de469105a660e426fa132f96b6a (patch)
tree11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /.gitignore
parentd8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff)
parent93ca711e64d7a4d79aee15b4ce415688f5415fda (diff)
downloadbarebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz
Merge branch 'for-next/omap'
Conflicts: Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7e98a25..9af6710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ barebox.bin
barebox.srec
barebox.netx
barebox.s5p
+barebox.spi
barebox.ubl
barebox.uimage
barebox.map