summaryrefslogtreecommitdiff
path: root/sh_config.mk
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-16 01:50:18 +0100
committerWolfgang Denk <wd@denx.de>2008-03-16 01:50:18 +0100
commite95bcc3661a78ccc094c365ecd2484d00a60f97d (patch)
tree0987662fbde9b8792a95ff00023bc22cfbaf2528 /sh_config.mk
parent0b8f2a27861a9fd06eb55a34f855ec9c5102aab4 (diff)
parentdecbe029b2a9d3333d02c433389b1c821eea96d7 (diff)
downloadu-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.zip
u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.gz
u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.bz2
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Conflicts: drivers/rtc/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'sh_config.mk')
0 files changed, 0 insertions, 0 deletions