| commit | a098cf41fdb2a6607c675f7fe4f3164617c9367e | [log] [tgz] |
|---|---|---|
| author | Allen Martin <amartin@nvidia.com> | Wed Dec 19 13:02:36 2012 -0800 |
| committer | Allen Martin <amartin@nvidia.com> | Wed Dec 19 13:02:36 2012 -0800 |
| tree | b37acb36f65909e6f74cc537d73efd883a1485a6 | |
| parent | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 [diff] | |
| parent | 095728803eedfce850a2f85828f79500cb09979e [diff] |
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged Conflicts: README arch/arm/cpu/armv7/exynos/clock.c board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h