]> git.ipfire.org Git - u-boot.git/commit
projects / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f218761 9ed887c)
Merge branch 'master' of git://88.191.163.10/u-boot-arm
authorTom Rini <trini@ti.com>
Sun, 18 Aug 2013 18:14:34 +0000 (14:14 -0400)
committerTom Rini <trini@ti.com>
Sun, 18 Aug 2013 18:14:34 +0000 (14:14 -0400)
commite20cc2ca15b5b0644f51b6e58d530d70acd2bc00
treef85a22536682ef54e77b1ba95cf0b71d00644632tree | snapshot
parentf21876174364391757e743cb8673d3fc5fce7ac7commit | diff
parent9ed887caecb9ecb0c68773a1870d143b9f28d3dacommit | diff
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>
.gitignore diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
arch/arm/include/asm/arch-am33xx/hardware.h diff1 | diff2 | blob | history
boards.cfg diff1 | diff2 | blob | history
"Das U-Boot" Source Tree