projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de20087 39c2095)
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)
Conflicts:
arch/arm/include/asm/mach-types.h

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

Trivial merge