Merge branch 'master' of http://git.denx.de/u-boot

author Kyungmin Park <kyungmin.park@samsung.com>

Wed, 31 Mar 2010 05:56:43 +0000 (14:56 +0900)

committer Kyungmin Park <kyungmin.park@samsung.com>

Wed, 31 Mar 2010 05:56:43 +0000 (14:56 +0900)
author Kyungmin Park <kyungmin.park@samsung.com>
Wed, 31 Mar 2010 05:56:43 +0000 (14:56 +0900)
committer Kyungmin Park <kyungmin.park@samsung.com>
Wed, 31 Mar 2010 05:56:43 +0000 (14:56 +0900)
diff --cc Makefile
Simple merge
diff --cc common/cmd_mmc.c
Simple merge
diff --cc common/cmd_mtdparts.c
Simple merge
diff --cc common/lcd.c
Simple merge
diff --cc drivers/i2c/Makefile

index c024c9c,29bda85..c024c9c

mode 100755,100644..100644
--- 1/drivers/i2c/Makefile
--- 2/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
diff --cc drivers/mmc/mmc.c
Simple merge
author	Kyungmin Park <kyungmin.park@samsung.com>
	Wed, 31 Mar 2010 05:56:43 +0000 (14:56 +0900)
committer	Kyungmin Park <kyungmin.park@samsung.com>
	Wed, 31 Mar 2010 05:56:43 +0000 (14:56 +0900)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_mtdparts.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/lcd.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history