Merge branch 'master' of party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 4 Oct 2010 11:56:36 +0000 (20:56 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 4 Oct 2010 11:56:36 +0000 (20:56 +0900)
1  2 
drivers/mmc/mmc.c
include/configs/s5pc1xx_universal.h

Simple merge
Simple merge