Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jun 2010 19:17:29 +0000 (21:17 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jun 2010 19:17:29 +0000 (21:17 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge