diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 07:25:36 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 07:25:36 (GMT) |
| commit | ec7023db8dc95966919589541f1ca09355a3f7a5 (patch) | |
| tree | 69be08a0b3f19e3e1d99ea7829931f8f800a01d9 /arch/arm/cpu/armv7/am33xx | |
| parent | e825b100d209a9d3c79b2998452cafa94eec986a (diff) | |
| parent | d782c1fe7246301143ed78c0d86ea6c81f9325f9 (diff) | |
| download | u-boot-ec7023db8dc95966919589541f1ca09355a3f7a5.tar.xz | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/mtd/nand/mxc_nand_spl.c
include/configs/m28evk.h
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx')
0 files changed, 0 insertions, 0 deletions