summaryrefslogtreecommitdiffstats
path: root/board/amcc/taishan
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
committerWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
commit2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch)
treee19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /board/amcc/taishan
parentcd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff)
parentf68ab43de67f59925542efb6bcec30f4a84fe695 (diff)
downloadblackbird-obmc-uboot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.gz
blackbird-obmc-uboot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.zip
Merge branch 'master' into next
Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/amcc/taishan')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud