summaryrefslogtreecommitdiff
path: root/include/configs/davinci_schmoogie.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 21:33:16 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 21:33:16 +0200
commit5ea67393b8b554b8165c38912d753a8df043020d (patch)
tree080077826cffcfebbaa0a950c663e7d165cf6b7d /include/configs/davinci_schmoogie.h
parent2395db48869e759c4422efa3d3c25161601aa17b (diff)
parentba04f7010958e88a8910f2a123fee53fdc72e013 (diff)
downloadu-boot-imx-5ea67393b8b554b8165c38912d753a8df043020d.zip
u-boot-imx-5ea67393b8b554b8165c38912d753a8df043020d.tar.gz
u-boot-imx-5ea67393b8b554b8165c38912d753a8df043020d.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Conflicts: include/asm-ppc/fsl_lbc.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/davinci_schmoogie.h')
0 files changed, 0 insertions, 0 deletions