diff options
| author | Tom Rini <trini@ti.com> | 2013-03-12 14:29:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-12 14:29:26 -0400 |
| commit | ce839172bc9db69e6f245f49b8754f1500306bd5 (patch) | |
| tree | 77282c7a32f8073166a28a11bc548c9a39002116 /common/env_nvram.c | |
| parent | d309a1003804716309f9e74e19959ab3fbdac453 (diff) | |
| parent | 05d212c0e101e6654bf8127275bac03fc0a7a382 (diff) | |
Merge branch 'am335x-power-2013.01.01' into ti-u-boot-2013.01.01
Conflicts:
arch/arm/cpu/armv7/omap-common/boot-common.c
board/ti/am335x/board.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/env_nvram.c')
0 files changed, 0 insertions, 0 deletions