| commit | 33de200c9c582b1a595a8eab652479e2142e0c95 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat May 11 09:25:36 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat May 11 09:25:36 2013 +0200 |
| tree | 69be08a0b3f19e3e1d99ea7829931f8f800a01d9 | |
| parent | 29e6eb37a6f1c14e7cbdb4ed6d6fb74bdf8f564c [diff] | |
| parent | 34ce0e1370116cb3fd3c52fdfc26b31ebf880366 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: drivers/mtd/nand/mxc_nand_spl.c include/configs/m28evk.h