diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:56 +0200 |
| commit | 8a11a59b379b641423a6ed655aae36ec00404403 (patch) | |
| tree | a10f059d0bdcf9ba043cef744d605f9260991b18 /.gitignore | |
| parent | e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39 (diff) | |
| parent | 9183a8c683014f7f6dae004009556c9c0d4d2a15 (diff) | |
| download | barebox-8a11a59b379b641423a6ed655aae36ec00404403.tar.gz barebox-8a11a59b379b641423a6ed655aae36ec00404403.tar.xz | |
Merge branch 'for-next/efi'
Conflicts:
.gitignore
Makefile
drivers/serial/Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a74b6d5f4e..a62e08c730 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ barebox.uimage barebox.map barebox.kwb barebox.kwbuart +barebox.efi barebox.canon-a1100.bin barebox-flash-image System.map |