#
31043e20 |
| 03-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
|
#
6d4511b2 |
| 03-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master' Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge.
|
#
e20cc2ca |
| 18-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://88.191.163.10/u-boot-arm Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts:
Merge branch 'master' of git://88.191.163.10/u-boot-arm Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
#
b98d9341 |
| 13-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
#
c15438ea |
| 12-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-video
|
#
0daa1f69 |
| 12-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
|
#
b62af3df |
| 12-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
|
#
35084760 |
| 26-Jul-2013 |
Roger Meier <roger@bufferoverflow.ch> |
libfdt: SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause Signed-off-by: Roger Meier <roger@bufferoverflow.ch> Acked-by: Wolfgang Denk <wd@denx.de>
|
#
9cd9b34d |
| 23-Feb-2013 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
03268374 |
| 21-Feb-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master' This pulls the three following ZYNQ commits into ARM master: 7dca54f8: xilinx: zynq: Enable DCC and create new zynq_d
Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master' This pulls the three following ZYNQ commits into ARM master: 7dca54f8: xilinx: zynq: Enable DCC and create new zynq_dcc board 59c651f4: arm: zynq: Add SLCR support with system reset 00ed3458: arm: zynq: Add lowlevel initialization to C
show more ...
|
#
951c6baa |
| 12-Feb-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
b2ba62a1 |
| 16-Jan-2013 |
Kim Phillips <kim.phillips@freescale.com> |
libfdt: update from upstream dtc commit 142419e commit 142419e "dtc/libfdt: sparse fixes", for u-boot's libfdt copy. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc:
libfdt: update from upstream dtc commit 142419e commit 142419e "dtc/libfdt: sparse fixes", for u-boot's libfdt copy. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Jerry Van Baren <gvb.uboot@gmail.com>
show more ...
|
#
0de71d50 |
| 12-Apr-2010 |
Peter Tyser <ptyser@xes-inc.com> |
Move libfdt/ into lib/ Move the libfdt directory into the common lib/ directory to clean up the top-level directory. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
|