diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
| commit | bee8dddbfcb07de469105a660e426fa132f96b6a (patch) | |
| tree | 11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /scripts/.gitignore | |
| parent | d8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff) | |
| parent | 93ca711e64d7a4d79aee15b4ce415688f5415fda (diff) | |
| download | barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
Makefile
Diffstat (limited to 'scripts/.gitignore')
| -rw-r--r-- | scripts/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index 6e63f85792..3f1cbdb912 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -2,6 +2,7 @@ bareboxenv bin2c gen_netx_image kallsyms +mk-am35xx-spi-image mkimage mkublheader omap_signGP |