Merge branch 'master' of git://git.denx.de/u-boot
authorMinkyu Kang <mk7.kang@samsung.com>
Tue, 6 Jul 2010 08:29:44 +0000 (17:29 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Tue, 6 Jul 2010 08:29:44 +0000 (17:29 +0900)

Trivial merge