Merge remote branch 'origin/master' into next
authorWolfgang Denk <wd@denx.de>
Mon, 22 Mar 2010 22:27:24 +0000 (23:27 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 22 Mar 2010 22:27:24 +0000 (23:27 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge