| commit | 84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 | [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 | c69ecd9722af22d50295eff81d0b9cd5b8adc2e0 [diff] | |
| parent | c2ded962d4703a3f9522553004db4a6fe540f7e6 [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>