| commit | 06f08e25e0a5350dcd4027fb9a9576cda1f738b4 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Sun Oct 26 14:03:08 2014 -0400 |
| committer | Tom Rini <trini@ti.com> | Sun Oct 26 14:03:08 2014 -0400 |
| tree | 3b2bf1b3689e9aad0d20f5a69ada168cae3cc769 | |
| parent | dffb827c492dcdca5a978524002459463162b774 [diff] | |
| parent | ac6fff23a247ecbe23a4476703745fd5604c27a0 [diff] |
Merge git://git.denx.de/u-boot-dm Fix a trivial conflict over adding <dm.h> Conflicts: arch/arm/cpu/armv7/omap3/board.c Signed-off-by: Tom Rini <trini@ti.com>