Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Mon, 21 Dec 2009 20:01:56 +0000 (21:01 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 21 Dec 2009 20:01:56 +0000 (21:01 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge