| #
bd5053ff |
| 14-Jan-2015 |
Tom Rini <trini@ti.com> |
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
Conflicts:
tools/buildman/control.py
Signed-off-by: Tom Rini <trini@ti.com>
|
| #
6393c43c |
| 14-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-video
|
| #
c88eaea0 |
| 11-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
|
| #
2db8c2d6 |
| 07-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
| #
11ada922 |
| 05-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh
|
| #
625509ab |
| 05-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|
| #
2dbbda08 |
| 04-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-sh
|
| #
07980824 |
| 04-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
|
| #
ccc39d66 |
| 04-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
|
| #
46b7b2e8 |
| 03-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mips
|
| #
a8b972bf |
| 03-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
|
| #
130aec77 |
| 03-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-spi
|
| #
2c54cb55 |
| 29-Oct-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-x86
|
| #
7bddac94 |
| 10-Oct-2014 |
Simon Glass <sjg@chromium.org> |
x86: Move paging functions into cpu.c
These functions really don't belong in physmem as they relate to the
cpu. Move them.
Signed-off-by: Simon Glass <sjg@chromium.org>
|
| #
4b19b744 |
| 08-Oct-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge remote-tracking branch 'u-boot-imx/master'
The single file conflict below is actually trivial.
Conflicts:
board/boundary/nitrogen6x/nitrogen6x.c
|
| #
3cc83f9d |
| 07-Oct-2014 |
Minkyu Kang <mk7.kang@samsung.com> |
Merge branch 'uboot'
|
| #
1454ba8e |
| 07-Oct-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
|
| #
2c2277f1 |
| 26-Sep-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
|
| #
2c3dc792 |
| 26-Sep-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
| #
c79cba37 |
| 17-Sep-2014 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
cosmetic: replace MIN, MAX with min, max
The macro MIN, MAX is defined as the aliase of min, max,
respectively.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
| #
efc284e3 |
| 12-Jul-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
e6c7f86f |
| 28-Jun-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
69f14dc2 |
| 19-Jun-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
spl/Makefile
|
| #
10e16732 |
| 08-Jun-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
|
| #
47b8e527 |
| 07-Jun-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-video
|