Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 23:20:49 +0000 (01:20 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 23:20:49 +0000 (01:20 +0200)
commit54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8
tree9e796e38d4edeabec4d091ed89d6fe179e84956c
parent86caca1cd97ba71b7a7c82f2b0163682df35ce5d
parent1f241263e088a71b8f33f87b03a37c5418d41e2e
Merge branch 'master' into next

Conflicts:
Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
Makefile
boards.cfg