Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Wed, 29 Jul 2009 22:36:25 +0000 (00:36 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 29 Jul 2009 22:36:25 +0000 (00:36 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge