Merge branch 'master' of git://git.denx.de/u-boot
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 2 Apr 2010 00:50:42 +0000 (09:50 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 2 Apr 2010 00:50:42 +0000 (09:50 +0900)
commit02671fa1ee1ad697d0e7ee1f7d950208c4cbc139
tree2a4219aad86960f5410fb94d512b9c01122ddaf6
parenta6364c78adefac3e6e233a3300249355632dc245
parentffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af
Merge branch 'master' of git://git.denx.de/u-boot
Makefile
common/cmd_mmc.c
common/cmd_mtdparts.c
common/lcd.c
drivers/i2c/Makefile
drivers/mmc/mmc.c