| commit | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Oct 29 20:03:00 2010 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Oct 29 20:03:00 2010 |
| tree | a046b11024bdf0a41082647c95df23a10cb206fc | |
| parent | d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f [diff] | |
| parent | 28e57108a61bd0e554d9847170b8ad9dad093e07 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-marvell Conflicts: include/configs/km_arm.h Signed-off-by: Wolfgang Denk <wd@denx.de>