| commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Fri Jul 12 10:36:48 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Fri Jul 12 10:36:48 2013 -0400 |
| tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d | |
| parent | d72da1582895ca226b995758426ec3769b54a9b8 [diff] | |
| parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and serial. Conflicts: arch/arm/dts/exynos5250.dtsi Signed-off-by: Tom Rini <trini@ti.com>