summaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-29 21:33:08 +0200
committerWolfgang Denk <wd@denx.de>2008-04-29 21:33:08 +0200
commitea6f66894f952229eebfc4ad03cd21fe5c8b3f0f (patch)
tree4fedd83b8df43012f791f25b5391df1048a96570 /CHANGELOG
parent70a0f81412b0b18a6fd0bea960451bc6c2cca49a (diff)
downloadblackbird-obmc-uboot-ea6f66894f952229eebfc4ad03cd21fe5c8b3f0f.tar.gz
blackbird-obmc-uboot-ea6f66894f952229eebfc4ad03cd21fe5c8b3f0f.zip
post/board/lwmon5/sysmon.c: fix manual merge error.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud