Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
1  2 
Makefile
board/evb64260/mpsc.c

diff --cc Makefile
Simple merge
Simple merge