| commit | 1d021a8e59a1fd6c8b74bab5e7c025da19ba323d | [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 | 90d40c61ec45a9284be281e6ae82af673deb1820 [diff] | |
| parent | 68f07cb426277183d207646db7bdfd98653c2ee8 [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>