| commit | abc587f7d1286a606d6fccc4d665a65a41934cf0 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Oct 29 22:03:00 2010 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Oct 29 22:03:00 2010 +0200 |
| tree | a046b11024bdf0a41082647c95df23a10cb206fc | |
| parent | 3d7d377be7460902cd79e7f69f791ee42630296f [diff] | |
| parent | 9a5ff78d6deb66eb2c6ea4f04b46b5ee0961b7a2 [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>