| #
dab5e346 |
| 16-Jul-2014 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts:
boards.cfg
|
| #
84f24ac8 |
| 11-Jul-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|
| #
22692ec0 |
| 09-Jul-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|
| #
304f936a |
| 01-Jul-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge remote-tracking branch 'u-boot-samsung/master'
Conflicts:
boards.cfg
Conflict was trivial between goni maintainer change and
lager_nor removal.
|
| #
019b57cc |
| 01-Jul-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
|
| #
e99f30e1 |
| 01-Jul-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
|
| #
d6694aff |
| 30-Jun-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
b5b8d85e |
| 30-Jun-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'
|
| #
01a3647a |
| 25-Jun-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
|
| #
ed1d98d8 |
| 25-Jun-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
|
| #
0ffc986a |
| 12-Jun-2014 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
.gitignore: drop include/asm/proc from ignore pattern
Commit 7d89982b stopped creating symbolic link
arch/${arch}/include/asm/proc.
arch/.gitignore should be updated.
S
.gitignore: drop include/asm/proc from ignore pattern
Commit 7d89982b stopped creating symbolic link
arch/${arch}/include/asm/proc.
arch/.gitignore should be updated.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Vasili Galka <vvv444@gmail.com>
show more ...
|
| #
8a452c2c |
| 21-May-2010 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-imx
|
| #
ab92d0fd |
| 08-May-2010 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
|
| #
f745817e |
| 27-Apr-2010 |
Mike Frysinger <vapier@gentoo.org> |
update include/asm/ gitignore after move
With the cpu include paths moved, the gitignore paths need updating.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Tom Ri
update include/asm/ gitignore after move
With the cpu include paths moved, the gitignore paths need updating.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Tom Rix <tom@bumblecow.com>
show more ...
|