Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 31 May 2010 00:13:11 +0000 (09:13 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 31 May 2010 00:13:11 +0000 (09:13 +0900)
commit922d27b596c179c5a7d68abe45ede5adb1b6589c
treec5ef3d5dc70bf51646a7fd7a379f6c2b2588cc2e
parentde200874fb9ecac51d74b4e9783ebb5d2e94c449
parent39c209546ab5b11ca6410c5cc57dcbf457e50800
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
arch/arm/include/asm/mach-types.h

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>