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

author Minkyu Kang <mk7.kang@samsung.com>

Wed, 10 Mar 2010 02:19:51 +0000 (11:19 +0900)

committer Minkyu Kang <mk7.kang@samsung.com>

Wed, 10 Mar 2010 02:19:51 +0000 (11:19 +0900)
author Minkyu Kang <mk7.kang@samsung.com>
Wed, 10 Mar 2010 02:19:51 +0000 (11:19 +0900)
committer Minkyu Kang <mk7.kang@samsung.com>
Wed, 10 Mar 2010 02:19:51 +0000 (11:19 +0900)
diff --cc Makefile
Simple merge
diff --cc board/atmel/at91sam9261ek/at91sam9261ek.c
Simple merge
diff --cc drivers/mmc/mmc.c
Simple merge
diff --cc include/configs/at91sam9261ek.h
Simple merge
diff --cc include/mmc.h
Simple merge
author	Minkyu Kang <mk7.kang@samsung.com>
	Wed, 10 Mar 2010 02:19:51 +0000 (11:19 +0900)
committer	Minkyu Kang <mk7.kang@samsung.com>
	Wed, 10 Mar 2010 02:19:51 +0000 (11:19 +0900)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
board/atmel/at91sam9261ek/at91sam9261ek.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/at91sam9261ek.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/mmc.h	patch \|	diff1 \|	diff2 \|	blob \| history