summaryrefslogtreecommitdiff
path: root/board/isee
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-29 22:03:00 +0200
committerWolfgang Denk <wd@denx.de>2010-10-29 22:03:00 +0200
commit0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch)
treea046b11024bdf0a41082647c95df23a10cb206fc /board/isee
parentd75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff)
parent28e57108a61bd0e554d9847170b8ad9dad093e07 (diff)
downloadu-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.zip
u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz
u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.bz2
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>
Diffstat (limited to 'board/isee')
0 files changed, 0 insertions, 0 deletions